remult 0.21.1 → 0.22.0

package/src/remult3/RepositoryImplementation.js

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRepository = exports.getEntityMetadata = exports.ControllerBase = exports.IdEntity = exports.EntityBase = exports.Entity = exports.decorateColumnSettings = exports.storableMember = exports.Field = exports.getValueList = exports.ValueListInfo = exports.ValueListFieldType = exports.isAutoIncrement = exports.Fields = exports.FieldType = exports.columnDefsImpl = exports.buildCaption = exports.CaptionTransformer = exports.getEntityRef = exports.FieldRefImplementation = exports.controllerRefImpl = exports.getControllerRef = exports.getFields = exports.rowHelperImplementation = exports.createOldEntity = exports.columnsOfType = exports.getEntityKey = exports.getEntitySettings = exports.entityInfo_key = exports.entityInfo = exports.__updateEntityBasedOnWhere = exports.RepositoryImplementation = void 0;
+exports.checkTarget = exports.getRepository = exports.getEntityMetadata = exports.ControllerBase = exports.IdEntity = exports.EntityBase = exports.Entity = exports.decorateColumnSettings = exports.storableMember = exports.Field = exports.getValueList = exports.ValueListInfo = exports.ValueListFieldType = exports.isAutoIncrement = exports.Fields = exports.FieldType = exports.columnDefsImpl = exports.buildCaption = exports.CaptionTransformer = exports.getEntityRef = exports.FieldRefImplementation = exports.controllerRefImpl = exports.getControllerRef = exports.getFields = exports.rowHelperImplementation = exports.createOldEntity = exports.columnsOfType = exports.getEntityKey = exports.getEntitySettings = exports.entityInfo_key = exports.entityInfo = exports.__updateEntityBasedOnWhere = exports.RepositoryImplementation = void 0;
 var tslib_1 = require("tslib");
 var column_1 = require("../column");
 var context_1 = require("../context");
 var filter_interfaces_1 = require("../filter/filter-interfaces");
 var sort_1 = require("../sort");
 var uuid_1 = require("uuid");
-var cuid_1 = tslib_1.__importDefault(require("cuid"));
+var cuid2_1 = require("@paralleldrive/cuid2");
 var valueConverters_1 = require("../valueConverters");
 var filter_interfaces_2 = require("../filter/filter-interfaces");
 var assign_1 = require("../../assign");
 var remult_proxy_1 = require("../remult-proxy");
+var rest_data_provider_1 = require("../data-providers/rest-data-provider");
 //import { remult } from "../remult-proxy";
 var classValidatorValidate = undefined;
 // import("class-validator".toString())
@@ -47,7 +48,8 @@ var RepositoryImplementation = /** @class */ (function () {
             return tslib_1.__generator(this, function (_h) {
                 values = new Map();
                 try {
-                    for (_a = tslib_1.__values(sort_1.Sort.translateOrderByToSort(this.metadata, orderBy).Segments), _b = _a.next(); !_b.done; _b = _a.next()) {
+                    for (_a = tslib_1.__values(sort_1.Sort.translateOrderByToSort(this.metadata, orderBy)
+                        .Segments), _b = _a.next(); !_b.done; _b = _a.next()) {
                         s = _b.value;
                         existingVal = lastRow[s.field.key];
                         // if (typeof existingVal !== "string" && typeof existingVal !== "number") {
@@ -71,7 +73,8 @@ var RepositoryImplementation = /** @class */ (function () {
                 r = { $or: [] };
                 equalToColumn = [];
                 try {
-                    for (_c = tslib_1.__values(sort_1.Sort.translateOrderByToSort(this.metadata, orderBy).Segments), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    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 = {};
@@ -110,7 +113,9 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     Object.defineProperty(RepositoryImplementation.prototype, "edp", {
         get: function () {
-            return this.__edp ? this.__edp : this.__edp = this.dataProvider.getEntityDataProvider(this.metadata);
+            return this.__edp
+                ? this.__edp
+                : (this.__edp = this.dataProvider.getEntityDataProvider(this.metadata));
         },
         enumerable: false,
         configurable: true
@@ -162,11 +167,12 @@ var RepositoryImplementation = /** @class */ (function () {
             this.idCache.set(this.getEntityRef(item).getId() + '', item);
     };
     Object.defineProperty(RepositoryImplementation.prototype, "metadata", {
-        get: function () { return this._info; },
+        get: function () {
+            return this._info;
+        },
         enumerable: false,
         configurable: true
     });
-    ;
     RepositoryImplementation.prototype.addEventListener = function (listener) {
         var _this = this;
         if (!this.listeners)
@@ -185,7 +191,8 @@ var RepositoryImplementation = /** @class */ (function () {
             this.fixTypes(entity);
             x = new rowHelperImplementation(this._info, entity, this, this.edp, this.remult, true);
             Object.defineProperty(entity, entityMember, {
-                get: function () { return x; }
+                //I've used define property to hide this member from console.lo g
+                get: function () { return x; },
             });
             x.saveOriginalData();
         }
@@ -194,7 +201,7 @@ var RepositoryImplementation = /** @class */ (function () {
     RepositoryImplementation.prototype.delete = function (item) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
-                if (typeof item === "string" || typeof item === "number")
+                if (typeof item === 'string' || typeof item === 'number')
                     return [2 /*return*/, this.edp.delete(item)];
                 else {
                     return [2 /*return*/, this.getRefForExistingRow(item, undefined).delete()];
@@ -244,7 +251,7 @@ var RepositoryImplementation = /** @class */ (function () {
                         ref = getEntityRef(entity, false);
                         if (!ref) return [3 /*break*/, 11];
                         if (!ref.isNew())
-                            throw "Item is not new";
+                            throw 'Item is not new';
                         return [4 /*yield*/, ref.save()];
                     case 10: return [2 /*return*/, _d.sent()];
                     case 11: return [4 /*yield*/, this.getEntityRef(this.create(entity)).save()];
@@ -271,7 +278,9 @@ var RepositoryImplementation = /** @class */ (function () {
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        ref = this.getEntityRef(entity);
+                        ref = getEntityRef(entity, false);
+                        if (!ref)
+                            ref = this.getEntityRef(tslib_1.__assign({}, entity));
                         if (!(!fields || fields.length === 0)) return [3 /*break*/, 2];
                         return [4 /*yield*/, ref.validate()];
                     case 1: return [2 /*return*/, _b.sent()];
@@ -346,7 +355,7 @@ var RepositoryImplementation = /** @class */ (function () {
             }
             this.fixTypes(instance);
             var row_1 = new rowHelperImplementation(this._info, instance, this, this.edp, this.remult, false);
-            if (typeof (id) === "object")
+            if (typeof id === 'object')
                 id = this.metadata.idMetadata.getId(id);
             if (id) {
                 row_1.id = id;
@@ -356,7 +365,7 @@ var RepositoryImplementation = /** @class */ (function () {
                 row_1.id = row_1.getId();
             ref = row_1;
             Object.defineProperty(instance, entityMember, {
-                get: function () { return row_1; }
+                get: function () { return row_1; },
             });
         }
         return ref;
@@ -396,17 +405,17 @@ var RepositoryImplementation = /** @class */ (function () {
             subscribe: function (l) {
                 var _a, _b;
                 var listener = l;
-                if (typeof l === "function") {
+                if (typeof l === 'function') {
                     listener = {
                         next: l,
                         complete: function () { },
-                        error: function () { }
+                        error: function () { },
                     };
                 }
                 (_a = listener.error) !== null && _a !== void 0 ? _a : (listener.error = function () { });
                 (_b = listener.complete) !== null && _b !== void 0 ? _b : (listener.complete = function () { });
                 return _this.remult.liveQuerySubscriber.subscribe(_this, options, listener);
-            }
+            },
         };
     };
     RepositoryImplementation.prototype.find = function (options, skipOrderByAndLimit) {
@@ -543,7 +552,10 @@ var RepositoryImplementation = /** @class */ (function () {
                             for (rawRows_1 = (e_9 = void 0, tslib_1.__values(rawRows)), rawRows_1_1 = rawRows_1.next(); !rawRows_1_1.done; rawRows_1_1 = rawRows_1.next()) {
                                 r = rawRows_1_1.value;
                                 val = r[col.key];
-                                if (val !== undefined && val !== null && !toLoad.includes(val) && !repo.idCache.has(val)) {
+                                if (val !== undefined &&
+                                    val !== null &&
+                                    !toLoad.includes(val) &&
+                                    !repo.idCache.has(val)) {
                                     toLoad.push(val);
                                 }
                             }
@@ -598,7 +610,8 @@ var RepositoryImplementation = /** @class */ (function () {
                         x = new this.entity(this.remult);
                         helper = new rowHelperImplementation(this._info, x, this, this.edp, this.remult, false);
                         Object.defineProperty(x, entityMember, {
-                            get: function () { return helper; }
+                            //I've used define property to hide this member from console.lo g
+                            get: function () { return helper; },
                         });
                         return [4 /*yield*/, helper.loadDataFrom(r, loadFields)];
                     case 1:
@@ -609,41 +622,60 @@ var RepositoryImplementation = /** @class */ (function () {
             });
         });
     };
-    // TODO2 - consider replacing with fromJsonArray - also consider having a TOJSON for similar cases
+    RepositoryImplementation.prototype.toJson = function (item) {
+        var _this = this;
+        if (item === undefined || item === null)
+            return item;
+        if (Array.isArray(item))
+            return item.map(function (x) { return _this.toJson(x); });
+        if (typeof item.then === 'function')
+            return item.then(function (x) { return _this.toJson(x); });
+        return this.getEntityRef(item).toApiJson(true);
+    };
     RepositoryImplementation.prototype.fromJson = function (json, newRow) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var obj, _a, _b, col, r, helper;
-            var e_11, _c;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        obj = {};
-                        try {
-                            for (_a = tslib_1.__values(this.fieldsOf(json)), _b = _a.next(); !_b.done; _b = _a.next()) {
-                                col = _b.value;
-                                if (json[col.key] !== undefined) {
-                                    obj[col.key] = col.valueConverter.fromJson(json[col.key]);
-                                }
-                            }
-                        }
-                        catch (e_11_1) { e_11 = { error: e_11_1 }; }
-                        finally {
-                            try {
-                                if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
-                            }
-                            finally { if (e_11) throw e_11.error; }
-                        }
-                        if (!newRow) return [3 /*break*/, 2];
-                        r = this.create();
-                        helper = this.getEntityRef(r);
-                        return [4 /*yield*/, helper.loadDataFrom(obj)];
-                    case 1:
-                        _d.sent();
-                        return [2 /*return*/, r];
-                    case 2: return [2 /*return*/, this.mapRawDataToResult(obj, undefined)];
+        var e_11, _a;
+        var _this = this;
+        if (json === null || json === undefined)
+            return json;
+        if (Array.isArray(json))
+            return json.map(function (item) { return _this.fromJson(item, newRow); });
+        var result = new this.entity(this.remult);
+        try {
+            for (var _b = tslib_1.__values(this.fieldsOf(json)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var col = _c.value;
+                var ei = getEntitySettings(col.valueType, false);
+                if (ei) {
+                    result[col.key] = this.remult
+                        .repo(col.valueType)
+                        .fromJson(json[col.key]);
+                }
+                else {
+                    if (json[col.key] !== undefined) {
+                        result[col.key] = col.valueConverter.fromJson(json[col.key]);
+                    }
                 }
+            }
+        }
+        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_11) throw e_11.error; }
+        }
+        this.fixTypes(result);
+        if (newRow) {
+            return this.create(result);
+        }
+        else {
+            var row_2 = new rowHelperImplementation(this._info, result, this, this.edp, this.remult, false);
+            Object.defineProperty(result, entityMember, {
+                //I've used define property to hide this member from console.lo g
+                get: function () { return row_2; },
             });
-        });
+            row_2.saveOriginalData();
+            return result;
+        }
     };
     RepositoryImplementation.prototype.count = function (where) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -664,73 +696,65 @@ var RepositoryImplementation = /** @class */ (function () {
             var w, r, cacheInfo, f, key;
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!options)
-                            options = {};
-                        if (where) {
-                            if (options.where) {
-                                w = options.where;
-                                options.where = {
-                                    $and: [
-                                        w,
-                                        where
-                                    ]
-                                };
-                            }
-                            else
-                                options.where = where;
-                        }
-                        if (!options.useCache) return [3 /*break*/, 2];
-                        return [4 /*yield*/, filter_interfaces_1.entityFilterToJson(this.metadata, options.where)];
-                    case 1:
-                        f = _a.sent();
-                        key = JSON.stringify(f);
-                        cacheInfo = this.cache.get(key);
-                        if (cacheInfo !== undefined) {
-                            if (cacheInfo.value && this.getEntityRef(cacheInfo.value).wasDeleted()) {
-                                cacheInfo = undefined;
-                                this.cache.delete(key);
-                            }
-                            else
-                                return [2 /*return*/, this.cache.get(key).promise];
-                        }
-                        else {
-                            cacheInfo = {
-                                value: undefined,
-                                promise: undefined
-                            };
-                            this.cache.set(key, cacheInfo);
+                if (!options)
+                    options = {};
+                if (where) {
+                    if (options.where) {
+                        w = options.where;
+                        options.where = {
+                            $and: [w, where],
+                        };
+                    }
+                    else
+                        options.where = where;
+                }
+                if (options.useCache) {
+                    f = rest_data_provider_1.findOptionsToJson(options, this.metadata);
+                    key = JSON.stringify(f);
+                    cacheInfo = this.cache.get(key);
+                    if (cacheInfo !== undefined) {
+                        if (cacheInfo.value &&
+                            this.getEntityRef(cacheInfo.value).wasDeleted()) {
+                            cacheInfo = undefined;
+                            this.cache.delete(key);
                         }
-                        _a.label = 2;
-                    case 2:
-                        r = this.find(tslib_1.__assign(tslib_1.__assign({}, options), { limit: 1 }), skipOrderByAndLimit).then(function (items) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                            var r;
-                            return tslib_1.__generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        r = undefined;
-                                        if (items.length > 0)
-                                            r = items[0];
-                                        if (!(!r && options.createIfNotFound)) return [3 /*break*/, 2];
-                                        r = this.create();
-                                        if (!options.where) return [3 /*break*/, 2];
-                                        return [4 /*yield*/, __updateEntityBasedOnWhere(this.metadata, options.where, r)];
-                                    case 1:
-                                        _a.sent();
-                                        _a.label = 2;
-                                    case 2: return [2 /*return*/, r];
-                                }
-                            });
-                        }); });
-                        if (cacheInfo) {
-                            cacheInfo.promise = r = r.then(function (r) {
-                                cacheInfo.value = r;
-                                return r;
-                            });
+                        else
+                            return [2 /*return*/, this.cache.get(key).promise];
+                    }
+                    else {
+                        cacheInfo = {
+                            value: undefined,
+                            promise: undefined,
+                        };
+                        this.cache.set(key, cacheInfo);
+                    }
+                }
+                r = this.find(tslib_1.__assign(tslib_1.__assign({}, options), { limit: 1 }), skipOrderByAndLimit).then(function (items) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                    var r;
+                    return tslib_1.__generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                r = undefined;
+                                if (items.length > 0)
+                                    r = items[0];
+                                if (!(!r && options.createIfNotFound)) return [3 /*break*/, 2];
+                                r = this.create();
+                                if (!options.where) return [3 /*break*/, 2];
+                                return [4 /*yield*/, __updateEntityBasedOnWhere(this.metadata, options.where, r)];
+                            case 1:
+                                _a.sent();
+                                _a.label = 2;
+                            case 2: return [2 /*return*/, r];
                         }
-                        return [2 /*return*/, r];
+                    });
+                }); });
+                if (cacheInfo) {
+                    cacheInfo.promise = r = r.then(function (r) {
+                        cacheInfo.value = r;
+                        return r;
+                    });
                 }
+                return [2 /*return*/, r];
             });
         });
     };
@@ -774,7 +798,11 @@ var RepositoryImplementation = /** @class */ (function () {
                                 item[field.key] = field.valueConverter.fromJson(field.valueConverter.toJson(val));
                             else
                                 try {
-                                    for (_c = (e_14 = void 0, tslib_1.__values([[String, "string"], [Number, "number"], [Boolean, "boolean"]])), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                    for (_c = (e_14 = void 0, tslib_1.__values([
+                                        [String, 'string'],
+                                        [Number, 'number'],
+                                        [Boolean, 'boolean'],
+                                    ])), _d = _c.next(); !_d.done; _d = _c.next()) {
                                         _e = tslib_1.__read(_d.value, 2), type = _e[0], typeName = _e[1];
                                         if (field.valueType === type && typeof val !== typeName)
                                             item[field.key] = field.valueConverter.fromJson(field.valueConverter.toJson(val));
@@ -804,8 +832,8 @@ var RepositoryImplementation = /** @class */ (function () {
     RepositoryImplementation.prototype.findId = function (id, options) {
         if (id === null || id === undefined)
             return null;
-        if (typeof id !== "string" && typeof id !== "number")
-            throw new Error("id can be either number or string, but got: " + typeof (id));
+        if (typeof id !== 'string' && typeof id !== 'number')
+            throw new Error('id can be either number or string, but got: ' + typeof id);
         return this.findFirst({}, tslib_1.__assign(tslib_1.__assign({ useCache: true }, options), { where: this.metadata.idMetadata.getIdFilter(id) }), true);
     };
     /* @internal*/
@@ -822,15 +850,13 @@ var RepositoryImplementation = /** @class */ (function () {
                         _a = [z];
                         return [4 /*yield*/, filter_interfaces_1.Filter.resolve(this.metadata.options.backendPrefilter)];
                     case 1:
-                        where = (_b.$and = _a.concat([
-                            _c.sent()
-                        ]),
+                        where = (_b.$and = _a.concat([_c.sent()]),
                             _b);
                         _c.label = 2;
                     case 2: return [4 /*yield*/, filter_interfaces_1.Filter.fromEntityFilter(this.metadata, where)];
                     case 3:
                         r = _c.sent();
-                        if (!(r && !this.dataProvider.supportsRawFilter)) return [3 /*break*/, 5];
+                        if (!(r && !this.dataProvider.isProxy)) return [3 /*break*/, 5];
                         return [4 /*yield*/, filter_interfaces_1.Filter.translateCustomWhere(r, this.metadata, this.remult)];
                     case 4:
                         r = _c.sent();
@@ -862,25 +888,26 @@ function __updateEntityBasedOnWhere(entityDefs, where, r) {
             isLessThan: emptyFunction,
             isNotNull: emptyFunction,
             isNull: emptyFunction,
-            or: emptyFunction
+            or: emptyFunction,
         });
     }
 }
 exports.__updateEntityBasedOnWhere = __updateEntityBasedOnWhere;
-exports.entityInfo = Symbol("entityInfo");
-exports.entityInfo_key = Symbol("entityInfo_key");
-var entityMember = Symbol("entityMember");
+exports.entityInfo = Symbol('entityInfo');
+exports.entityInfo_key = Symbol('entityInfo_key');
+var entityMember = Symbol('entityMember');
 function getEntitySettings(entity, throwError) {
     if (throwError === void 0) { throwError = true; }
     if (entity === undefined)
         if (throwError) {
-            throw new Error("Undefined is not an entity :)");
+            throw new Error('Undefined is not an entity :)');
         }
         else
             return undefined;
     var info = Reflect.getMetadata(exports.entityInfo, entity);
     if (!info && throwError)
-        throw new Error(entity.prototype.constructor.name + " is not a known entity, did you forget to set @Entity() or did you forget to add the '@' before the call to Entity?");
+        throw new Error(entity.prototype.constructor.name +
+            " is not a known entity, did you forget to set @Entity() or did you forget to add the '@' before the call to Entity?");
     return info;
 }
 exports.getEntitySettings = getEntitySettings;
@@ -893,7 +920,7 @@ function createOldEntity(entity, remult) {
     var _this = this;
     var r = exports.columnsOfType.get(entity);
     if (!r)
-        exports.columnsOfType.set(entity, r = []);
+        exports.columnsOfType.set(entity, (r = []));
     var info = getEntitySettings(entity)(remult);
     var key = getEntityKey(entity);
     var base = Object.getPrototypeOf(entity);
@@ -907,7 +934,13 @@ function createOldEntity(entity, remult) {
         if (baseSettingsFactory) {
             var baseSettings_1 = baseSettingsFactory(remult);
             info = tslib_1.__assign(tslib_1.__assign({}, baseSettings_1), info);
-            var functions = ["saving", "saved", "deleting", "deleted", "validation"];
+            var functions = [
+                'saving',
+                'saved',
+                'deleting',
+                'deleted',
+                'validation',
+            ];
             var _loop_2 = function (key_1) {
                 if (baseSettings_1[key_1] && baseSettings_1[key_1] !== info[key_1]) {
                     var x_1 = info[key_1];
@@ -997,7 +1030,7 @@ var rowHelperBase = /** @class */ (function () {
                         }
                         refImpl_1._subscribers.reportChanged();
                     },
-                    enumerable: true
+                    enumerable: true,
                 });
                 lookup_1.set(val);
             }
@@ -1042,7 +1075,6 @@ var rowHelperBase = /** @class */ (function () {
         var _this = this;
         if (!this._subscribers) {
             this._subscribers = new SubscribableImp();
-            ;
             var _loop_4 = function (col) {
                 var ei = getEntitySettings(col.valueType, false);
                 var refImpl = this_2.fields.find(col.key);
@@ -1062,7 +1094,7 @@ var rowHelperBase = /** @class */ (function () {
                             _this._subscribers.reportChanged();
                             refImpl._subscribers.reportChanged();
                         },
-                        enumerable: true
+                        enumerable: true,
                     });
                 }
             };
@@ -1116,14 +1148,15 @@ var rowHelperBase = /** @class */ (function () {
         var e_18, _a;
         var error = {
             modelState: Object.assign({}, this.errors),
-            message: this.error
+            message: this.error,
         };
         if (!error.message) {
             try {
                 for (var _b = tslib_1.__values(this.columnsInfo), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var col = _c.value;
                     if (this.errors[col.key]) {
-                        error.message = this.fields[col.key].metadata.caption + ": " + this.errors[col.key];
+                        error.message =
+                            this.fields[col.key].metadata.caption + ': ' + this.errors[col.key];
                         this.error = error.message;
                         break;
                     }
@@ -1225,8 +1258,7 @@ var rowHelperBase = /** @class */ (function () {
         this.originalValues = this.copyDataToObject();
         this.saveMoreOriginalData();
     };
-    rowHelperBase.prototype.saveMoreOriginalData = function () {
-    };
+    rowHelperBase.prototype.saveMoreOriginalData = function () { };
     rowHelperBase.prototype.validate = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var r;
@@ -1273,23 +1305,27 @@ var rowHelperBase = /** @class */ (function () {
         });
     };
     rowHelperBase.prototype.__performColumnAndEntityValidations = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/];
-            });
-        });
+        return tslib_1.__awaiter(this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
     };
-    rowHelperBase.prototype.toApiJson = function () {
+    rowHelperBase.prototype.toApiJson = function (includeRelatedEntities) {
         var e_21, _a;
+        if (includeRelatedEntities === void 0) { includeRelatedEntities = false; }
         var result = {};
         try {
             for (var _b = tslib_1.__values(this.columnsInfo), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var col = _c.value;
-                if (!this.remult || col.includeInApi === undefined || this.remult.isAllowed(col.includeInApi)) {
+                if (!this.remult ||
+                    col.includeInApi === undefined ||
+                    this.remult.isAllowed(col.includeInApi)) {
                     var val = void 0;
                     var lu = this.lookups.get(col.key);
                     if (lu)
-                        val = lu.id;
+                        if (includeRelatedEntities)
+                            val = lu.toJson();
+                        else
+                            val = lu.id;
                     else {
                         val = this.instance[col.key];
                         if (!this.remult) {
@@ -1326,8 +1362,11 @@ var rowHelperBase = /** @class */ (function () {
                             for (_a = tslib_1.__values(this.columnsInfo), _b = _a.next(); !_b.done; _b = _a.next()) {
                                 col = _b.value;
                                 if (keys.includes(col.key))
-                                    if (col.includeInApi === undefined || this.remult.isAllowed(col.includeInApi)) {
-                                        if (!this.remult || col.allowApiUpdate === undefined || this.remult.isAllowedForInstance(this.instance, col.allowApiUpdate)) {
+                                    if (col.includeInApi === undefined ||
+                                        this.remult.isAllowed(col.includeInApi)) {
+                                        if (!this.remult ||
+                                            col.allowApiUpdate === undefined ||
+                                            this.remult.isAllowedForInstance(this.instance, col.allowApiUpdate)) {
                                             lu = this.lookups.get(col.key);
                                             if (lu)
                                                 lu.id = body[col.key];
@@ -1371,7 +1410,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                 for (var _b = tslib_1.__values(info.columnsInfo), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var col = _c.value;
                     if (col.defaultValue && instance[col.key] === undefined) {
-                        if (typeof col.defaultValue === "function") {
+                        if (typeof col.defaultValue === 'function') {
                             instance[col.key] = col.defaultValue(instance);
                         }
                         else if (!instance[col.key])
@@ -1394,17 +1433,23 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         return _this;
     }
     Object.defineProperty(rowHelperImplementation.prototype, "apiUpdateAllowed", {
-        get: function () { return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiUpdate); },
+        get: function () {
+            return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiUpdate);
+        },
         enumerable: false,
         configurable: true
     });
     Object.defineProperty(rowHelperImplementation.prototype, "apiDeleteAllowed", {
-        get: function () { return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiDelete); },
+        get: function () {
+            return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiDelete);
+        },
         enumerable: false,
         configurable: true
     });
     Object.defineProperty(rowHelperImplementation.prototype, "apiInsertAllowed", {
-        get: function () { return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiInsert); },
+        get: function () {
+            return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiInsert);
+        },
         enumerable: false,
         configurable: true
     });
@@ -1453,7 +1498,9 @@ var rowHelperImplementation = /** @class */ (function (_super) {
             if (!this._columns) {
                 var _items_1 = [];
                 var r_1 = (_a = {
-                        find: function (c) { return r_1[typeof c === "string" ? c : c.key]; }
+                        find: function (c) {
+                            return r_1[typeof c === 'string' ? c : c.key];
+                        }
                     },
                     _a[Symbol.iterator] = function () { return _items_1[Symbol.iterator](); },
                     _a.toArray = function () { return _items_1; },
@@ -1461,7 +1508,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                 try {
                     for (var _c = tslib_1.__values(this.info.columnsInfo), _d = _c.next(); !_d.done; _d = _c.next()) {
                         var c = _d.value;
-                        _items_1.push(r_1[c.key] = new FieldRefImplementation(c, this.info.fields[c.key], this.instance, this, this));
+                        _items_1.push((r_1[c.key] = new FieldRefImplementation(c, this.info.fields[c.key], this.instance, this, this)));
                     }
                 }
                 catch (e_24_1) { e_24 = { error: e_24_1 }; }
@@ -1488,10 +1535,10 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     case 0:
                         _l.trys.push([0, , 34, 35]);
                         if (this._saving)
-                            throw new Error("cannot save while entity is already saving");
+                            throw new Error('cannot save while entity is already saving');
                         this._saving = true;
                         if (this.wasDeleted())
-                            throw new Error("cannot save a deleted row");
+                            throw new Error('cannot save a deleted row');
                         this.isLoading = true;
                         return [4 /*yield*/, this.__validateEntity()];
                     case 1:
@@ -1526,7 +1573,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [7 /*endfinally*/];
                     case 9:
                         if (!this.info.entityInfo.saving) return [3 /*break*/, 11];
-                        return [4 /*yield*/, this.info.entityInfo.saving(this.instance, function () { return doNotSave_1 = true; })];
+                        return [4 /*yield*/, this.info.entityInfo.saving(this.instance, function () { return (doNotSave_1 = true); })];
                     case 10:
                         _l.sent();
                         _l.label = 11;
@@ -1553,7 +1600,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                             finally { if (e_27) throw e_27.error; }
                         }
                         if (this.info.idMetadata.field instanceof column_1.CompoundIdField)
-                            delete (d.id);
+                            delete d.id;
                         updatedRow = void 0;
                         isNew = this.isNew();
                         _l.label = 12;
@@ -1571,7 +1618,8 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         for (key in d) {
                             if (Object.prototype.hasOwnProperty.call(d, key)) {
                                 element = d[key];
-                                if (this.fields.find(key).valueChanged() && !ignoreKeys.includes(key)) {
+                                if (this.fields.find(key).valueChanged() &&
+                                    !ignoreKeys.includes(key)) {
                                     changesOnly[key] = element;
                                     wasChanged = true;
                                 }
@@ -1921,7 +1969,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     return rowHelperImplementation;
 }(rowHelperBase));
 exports.rowHelperImplementation = rowHelperImplementation;
-var controllerColumns = Symbol("controllerColumns");
+var controllerColumns = Symbol('controllerColumns');
 function prepareColumnInfo(r, remult) {
     return r.map(function (x) { return decorateColumnSettings(x.settings(remult), remult); });
 }
@@ -1937,7 +1985,7 @@ function getControllerRef(container, remultArg) {
     if (!result) {
         var columnSettings_1 = exports.columnsOfType.get(container.constructor);
         if (!columnSettings_1)
-            exports.columnsOfType.set(container.constructor, columnSettings_1 = []);
+            exports.columnsOfType.set(container.constructor, (columnSettings_1 = []));
         var base = Object.getPrototypeOf(container.constructor);
         while (base != null) {
             var baseCols = exports.columnsOfType.get(base);
@@ -1958,7 +2006,9 @@ var controllerRefImpl = /** @class */ (function (_super) {
         var _this = _super.call(this, columnsInfo, instance, remult) || this;
         var _items = [];
         var r = (_a = {
-                find: function (c) { return r[typeof c === "string" ? c : c.key]; }
+                find: function (c) {
+                    return r[typeof c === 'string' ? c : c.key];
+                }
             },
             _a[Symbol.iterator] = function () { return _items[Symbol.iterator](); },
             _a.toArray = function () { return _items; },
@@ -1966,7 +2016,7 @@ var controllerRefImpl = /** @class */ (function (_super) {
         try {
             for (var columnsInfo_2 = tslib_1.__values(columnsInfo), columnsInfo_2_1 = columnsInfo_2.next(); !columnsInfo_2_1.done; columnsInfo_2_1 = columnsInfo_2.next()) {
                 var col = columnsInfo_2_1.value;
-                _items.push(r[col.key] = new FieldRefImplementation(col, new columnDefsImpl(col, undefined, remult), instance, undefined, _this));
+                _items.push((r[col.key] = new FieldRefImplementation(col, new columnDefsImpl(col, undefined, remult), instance, undefined, _this)));
             }
         }
         catch (e_34_1) { e_34 = { error: e_34_1 }; }
@@ -2105,20 +2155,21 @@ var FieldRefImplementation = /** @class */ (function () {
                 else
                     return this.value.toString();
             }
-            return "";
+            return '';
         },
         enumerable: false,
         configurable: true
     });
-    ;
     Object.defineProperty(FieldRefImplementation.prototype, "value", {
-        get: function () { return this.container[this.metadata.key]; },
-        set: function (value) { this.container[this.metadata.key] = value; },
+        get: function () {
+            return this.container[this.metadata.key];
+        },
+        set: function (value) {
+            this.container[this.metadata.key] = value;
+        },
         enumerable: false,
         configurable: true
     });
-    ;
-    ;
     Object.defineProperty(FieldRefImplementation.prototype, "originalValue", {
         get: function () {
             this.reportObserved();
@@ -2130,7 +2181,6 @@ var FieldRefImplementation = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    ;
     FieldRefImplementation.prototype.rawOriginalValue = function () {
         return this.rowBase.originalValues[this.metadata.key];
     };
@@ -2162,7 +2212,6 @@ var FieldRefImplementation = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    ;
     FieldRefImplementation.prototype.valueChanged = function () {
         this.reportObserved();
         var val = this.value;
@@ -2170,7 +2219,7 @@ var FieldRefImplementation = /** @class */ (function () {
         if (lu) {
             val = lu.id;
         }
-        return JSON.stringify(this.metadata.valueConverter.toJson(this.rowBase.originalValues[this.metadata.key])) != JSON.stringify(this.metadata.valueConverter.toJson(val));
+        return (JSON.stringify(this.metadata.valueConverter.toJson(this.rowBase.originalValues[this.metadata.key])) != JSON.stringify(this.metadata.valueConverter.toJson(val)));
     };
     FieldRefImplementation.prototype.__performValidation = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -2180,7 +2229,7 @@ var FieldRefImplementation = /** @class */ (function () {
                 switch (_d.label) {
                     case 0:
                         _d.trys.push([0, 12, , 13]);
-                        x = typeof (this.settings.validate);
+                        x = typeof this.settings.validate;
                         if (!Array.isArray(this.settings.validate)) return [3 /*break*/, 9];
                         _d.label = 1;
                     case 1:
@@ -2218,7 +2267,7 @@ var FieldRefImplementation = /** @class */ (function () {
                     case 11: return [3 /*break*/, 13];
                     case 12:
                         error_1 = _d.sent();
-                        if (typeof error_1 === "string")
+                        if (typeof error_1 === 'string')
                             this.error = error_1;
                         else
                             this.error = error_1.message;
@@ -2247,16 +2296,18 @@ function getEntityRef(entity, throwException) {
     if (throwException === void 0) { throwException = true; }
     var x = entity[entityMember];
     if (!x && throwException)
-        throw new Error("item " + entity.constructor.name + " was not initialized using a context");
+        throw new Error('item ' +
+            entity.constructor.name +
+            ' was not initialized using a context');
     return x;
 }
 exports.getEntityRef = getEntityRef;
 exports.CaptionTransformer = {
-    transformCaption: function (remult, key, caption) { return caption; }
+    transformCaption: function (remult, key, caption) { return caption; },
 };
 function buildCaption(caption, key, remult) {
     var result;
-    if (typeof (caption) === "function") {
+    if (typeof caption === 'function') {
         if (remult)
             result = caption(remult);
     }
@@ -2279,12 +2330,12 @@ var columnDefsImpl = /** @class */ (function () {
         this.target = this.settings.target;
         this.valueConverter = this.settings.valueConverter;
         this.allowNull = !!this.settings.allowNull;
-        this.inputType = this.settings.inputType;
-        this.key = this.settings.key;
         this.valueType = this.settings.valueType;
+        this.key = this.settings.key;
+        this.inputType = this.settings.inputType;
         if (settings.serverExpression)
             this.isServerExpression = true;
-        if (typeof (this.settings.allowApiUpdate) === "boolean")
+        if (typeof this.settings.allowApiUpdate === 'boolean')
             this.readonly = this.settings.allowApiUpdate;
         if (!this.inputType)
             this.inputType = this.valueConverter.inputType;
@@ -2296,7 +2347,9 @@ var columnDefsImpl = /** @class */ (function () {
         return this.remult.isAllowedForInstance(item, this.options.allowApiUpdate);
     };
     columnDefsImpl.prototype.displayValue = function (item) {
-        return this.remult.repo(this.entityDefs.entityType).getEntityRef(item).fields.find(this.key).displayValue;
+        return this.entityDefs
+            .getEntityMetadataWithoutBreakingTheEntity(item)
+            .fields.find(this.key).displayValue;
     };
     Object.defineProperty(columnDefsImpl.prototype, "includedInApi", {
         get: function () {
@@ -2322,7 +2375,7 @@ var columnDefsImpl = /** @class */ (function () {
                         _a.trys.push([0, , 5, 6]);
                         if (!this.settings.sqlExpression) return [3 /*break*/, 4];
                         result = void 0;
-                        if (!(typeof this.settings.sqlExpression === "function")) return [3 /*break*/, 2];
+                        if (!(typeof this.settings.sqlExpression === 'function')) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.settings.sqlExpression(this.entityDefs)];
                     case 1:
                         result = _a.sent();
@@ -2345,7 +2398,7 @@ var columnDefsImpl = /** @class */ (function () {
         get: function () {
             var result;
             if (this.settings.sqlExpression) {
-                if (typeof this.settings.sqlExpression === "function") {
+                if (typeof this.settings.sqlExpression === 'function') {
                     result = this.settings.sqlExpression(this.entityDefs);
                 }
                 else
@@ -2365,7 +2418,6 @@ var columnDefsImpl = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    ;
     return columnDefsImpl;
 }());
 exports.columnDefsImpl = columnDefsImpl;
@@ -2378,7 +2430,6 @@ var EntityFullInfo = /** @class */ (function () {
         this.remult = remult;
         this.entityType = entityType;
         this.key = key;
-        this.options = this.entityInfo;
         this.idMetadata = {
             getId: function (item) {
                 if (_this.idMetadata.field instanceof column_1.CompoundIdField)
@@ -2390,7 +2441,9 @@ var EntityFullInfo = /** @class */ (function () {
             createIdInFilter: function (items) {
                 if (items.length > 0)
                     return {
-                        $or: items.map(function (x) { return _this.idMetadata.getIdFilter(getEntityRef(x).getId()); })
+                        $or: items.map(function (x) {
+                            return _this.idMetadata.getIdFilter(getEntityRef(x).getId());
+                        }),
                     };
             },
             isIdField: function (col) {
@@ -2405,7 +2458,7 @@ var EntityFullInfo = /** @class */ (function () {
                 if (_this.idMetadata.field instanceof column_1.CompoundIdField) {
                     var field_1 = _this.idMetadata.field;
                     return {
-                        $or: ids.map(function (x) { return field_1.isEqualTo(x); })
+                        $or: ids.map(function (x) { return field_1.isEqualTo(x); }),
                     };
                 }
                 if (ids.length == 1)
@@ -2416,15 +2469,21 @@ var EntityFullInfo = /** @class */ (function () {
                     return _b = {},
                         _b[_this.idMetadata.field.key] = ids,
                         _b;
-            }
+            },
         };
+        this.options = entityInfo;
         if (this.options.allowApiCrud !== undefined) {
+            var crud = void 0;
+            if (typeof this.options.allowApiCrud === 'function')
+                crud = function (_, remult) { return _this.options.allowApiCrud(remult); };
+            else
+                crud = this.options.allowApiCrud;
             if (this.options.allowApiDelete === undefined)
-                this.options.allowApiDelete = this.options.allowApiCrud;
+                this.options.allowApiDelete = crud;
             if (this.options.allowApiInsert === undefined)
-                this.options.allowApiInsert = this.options.allowApiCrud;
+                this.options.allowApiInsert = crud;
             if (this.options.allowApiUpdate === undefined)
-                this.options.allowApiUpdate = this.options.allowApiCrud;
+                this.options.allowApiUpdate = crud;
             if (this.options.allowApiRead === undefined)
                 this.options.allowApiRead = this.options.allowApiCrud;
         }
@@ -2436,7 +2495,9 @@ var EntityFullInfo = /** @class */ (function () {
             entityInfo.dbName = this.key;
         var _items = [];
         var r = (_a = {
-                find: function (c) { return r[typeof c === "string" ? c : c.key]; }
+                find: function (c) {
+                    return r[typeof c === 'string' ? c : c.key];
+                }
             },
             _a[Symbol.iterator] = function () { return _items[Symbol.iterator](); },
             _a.toArray = function () { return _items; },
@@ -2444,7 +2505,7 @@ var EntityFullInfo = /** @class */ (function () {
         try {
             for (var columnsInfo_3 = tslib_1.__values(columnsInfo), columnsInfo_3_1 = columnsInfo_3.next(); !columnsInfo_3_1.done; columnsInfo_3_1 = columnsInfo_3.next()) {
                 var x = columnsInfo_3_1.value;
-                _items.push(r[x.key] = new columnDefsImpl(x, this, remult));
+                _items.push((r[x.key] = new columnDefsImpl(x, this, remult)));
             }
         }
         catch (e_37_1) { e_37 = { error: e_37_1 }; }
@@ -2468,8 +2529,8 @@ var EntityFullInfo = /** @class */ (function () {
                 this.idMetadata.field = r_2;
         }
         else {
-            if (this.fields["id"])
-                this.idMetadata.field = this.fields["id"];
+            if (this.fields['id'])
+                this.idMetadata.field = this.fields['id'];
             else
                 this.idMetadata.field = tslib_1.__spread(this.fields)[0];
         }
@@ -2477,7 +2538,9 @@ var EntityFullInfo = /** @class */ (function () {
     EntityFullInfo.prototype.apiUpdateAllowed = function (item) {
         if (this.options.allowApiUpdate === undefined)
             return false;
-        return !item ? this.remult.isAllowedForInstance(undefined, this.options.allowApiUpdate) : this.remult.repo(this.entityType).getEntityRef(item).apiUpdateAllowed;
+        return !item
+            ? this.remult.isAllowedForInstance(undefined, this.options.allowApiUpdate)
+            : this.getEntityMetadataWithoutBreakingTheEntity(item).apiUpdateAllowed;
     };
     Object.defineProperty(EntityFullInfo.prototype, "apiReadAllowed", {
         get: function () {
@@ -2491,12 +2554,22 @@ var EntityFullInfo = /** @class */ (function () {
     EntityFullInfo.prototype.apiDeleteAllowed = function (item) {
         if (this.options.allowApiDelete === undefined)
             return false;
-        return !item ? this.remult.isAllowedForInstance(undefined, this.options.allowApiDelete) : this.remult.repo(this.entityType).getEntityRef(item).apiDeleteAllowed;
+        return !item
+            ? this.remult.isAllowedForInstance(undefined, this.options.allowApiDelete)
+            : this.getEntityMetadataWithoutBreakingTheEntity(item).apiDeleteAllowed;
     };
     EntityFullInfo.prototype.apiInsertAllowed = function (item) {
         if (this.options.allowApiUpdate === undefined)
             return false;
-        return !item ? this.remult.isAllowedForInstance(undefined, this.options.allowApiInsert) : this.remult.repo(this.entityType).getEntityRef(item).apiInsertAllowed;
+        return !item
+            ? this.remult.isAllowedForInstance(undefined, this.options.allowApiInsert)
+            : this.getEntityMetadataWithoutBreakingTheEntity(item).apiInsertAllowed;
+    };
+    EntityFullInfo.prototype.getEntityMetadataWithoutBreakingTheEntity = function (item) {
+        var result = getEntityRef(item, false);
+        if (result)
+            return result;
+        return this.remult.repo(this.entityType).getEntityRef(tslib_1.__assign({}, item));
     };
     EntityFullInfo.prototype.getDbName = function () {
         var _this = this;
@@ -2505,9 +2578,9 @@ var EntityFullInfo = /** @class */ (function () {
         if (!this.options.sqlExpression) {
             this.dbNamePromise = Promise.resolve(this.options.dbName);
         }
-        if (typeof this.options.sqlExpression === "string")
+        if (typeof this.options.sqlExpression === 'string')
             this.dbNamePromise = Promise.resolve(this.options.sqlExpression);
-        else if (typeof this.options.sqlExpression === "function") {
+        else if (typeof this.options.sqlExpression === 'function') {
             var r = this.options.sqlExpression(this);
             if (r instanceof Promise)
                 this.dbNamePromise = r;
@@ -2528,7 +2601,7 @@ function FieldType() {
     for (var _i = 0; _i < arguments.length; _i++) {
         options[_i] = arguments[_i];
     }
-    return function (target) {
+    return function (target, context) {
         if (!options) {
             options = [];
         }
@@ -2543,7 +2616,7 @@ var Fields = /** @class */ (function () {
     }
     /**
      * Stored as a JSON.stringify - to store as json use Fields.json
-    */
+     */
     Fields.object = function () {
         var options = [];
         for (var _i = 0; _i < arguments.length; _i++) {
@@ -2556,10 +2629,11 @@ var Fields = /** @class */ (function () {
         for (var _i = 0; _i < arguments.length; _i++) {
             options[_i] = arguments[_i];
         }
-        return Field.apply(void 0, tslib_1.__spread([undefined, {
+        return Field.apply(void 0, tslib_1.__spread([undefined,
+            {
                 valueConverter: {
-                    fieldTypeInDb: "json"
-                }
+                    fieldTypeInDb: 'json',
+                },
             }], options));
     };
     Fields.dateOnly = function () {
@@ -2568,7 +2642,7 @@ var Fields = /** @class */ (function () {
             options[_i] = arguments[_i];
         }
         return Field.apply(void 0, tslib_1.__spread([function () { return Date; }, {
-                valueConverter: valueConverters_1.ValueConverters.DateOnly
+                valueConverter: valueConverters_1.ValueConverters.DateOnly,
             }], options));
     };
     Fields.date = function () {
@@ -2584,7 +2658,7 @@ var Fields = /** @class */ (function () {
             options[_i] = arguments[_i];
         }
         return Field.apply(void 0, tslib_1.__spread([function () { return Number; }, {
-                valueConverter: valueConverters_1.ValueConverters.Integer
+                valueConverter: valueConverters_1.ValueConverters.Integer,
             }], options));
     };
     Fields.autoIncrement = function () {
@@ -2592,10 +2666,11 @@ var Fields = /** @class */ (function () {
         for (var _i = 0; _i < arguments.length; _i++) {
             options[_i] = arguments[_i];
         }
-        return Field.apply(void 0, tslib_1.__spread([function () { return Number; }, {
+        return Field.apply(void 0, tslib_1.__spread([function () { return Number; },
+            {
                 allowApiUpdate: false,
                 dbReadOnly: true,
-                valueConverter: tslib_1.__assign(tslib_1.__assign({}, valueConverters_1.ValueConverters.Integer), { fieldTypeInDb: 'autoincrement' })
+                valueConverter: tslib_1.__assign(tslib_1.__assign({}, valueConverters_1.ValueConverters.Integer), { fieldTypeInDb: 'autoincrement' }),
             }], options));
     };
     Fields.number = function () {
@@ -2610,12 +2685,13 @@ var Fields = /** @class */ (function () {
         for (var _i = 0; _i < arguments.length; _i++) {
             options[_i] = arguments[_i];
         }
-        return Field.apply(void 0, tslib_1.__spread([function () { return Date; }, {
+        return Field.apply(void 0, tslib_1.__spread([function () { return Date; },
+            {
                 allowApiUpdate: false,
                 saving: function (_, ref) {
                     if (getEntityRef(_).isNew())
                         ref.value = new Date();
-                }
+                },
             }], options));
     };
     Fields.updatedAt = function () {
@@ -2623,11 +2699,12 @@ var Fields = /** @class */ (function () {
         for (var _i = 0; _i < arguments.length; _i++) {
             options[_i] = arguments[_i];
         }
-        return Field.apply(void 0, tslib_1.__spread([function () { return Date; }, {
+        return Field.apply(void 0, tslib_1.__spread([function () { return Date; },
+            {
                 allowApiUpdate: false,
                 saving: function (_, ref) {
                     ref.value = new Date();
-                }
+                },
             }], options));
     };
     Fields.uuid = function () {
@@ -2635,13 +2712,14 @@ var Fields = /** @class */ (function () {
         for (var _i = 0; _i < arguments.length; _i++) {
             options[_i] = arguments[_i];
         }
-        return Field.apply(void 0, tslib_1.__spread([function () { return String; }, {
+        return Field.apply(void 0, tslib_1.__spread([function () { return String; },
+            {
                 allowApiUpdate: false,
                 defaultValue: function () { return uuid_1.v4(); },
                 saving: function (_, r) {
                     if (!r.value)
                         r.value = uuid_1.v4();
-                }
+                },
             }], options));
     };
     Fields.cuid = function () {
@@ -2649,13 +2727,14 @@ var Fields = /** @class */ (function () {
         for (var _i = 0; _i < arguments.length; _i++) {
             options[_i] = arguments[_i];
         }
-        return Field.apply(void 0, tslib_1.__spread([function () { return String; }, {
+        return Field.apply(void 0, tslib_1.__spread([function () { return String; },
+            {
                 allowApiUpdate: false,
-                defaultValue: function () { return cuid_1.default(); },
+                defaultValue: function () { return cuid2_1.createId(); },
                 saving: function (_, r) {
                     if (!r.value)
-                        r.value = cuid_1.default();
-                }
+                        r.value = cuid2_1.createId();
+                },
             }], options));
     };
     Fields.string = function () {
@@ -2685,11 +2764,12 @@ function ValueListFieldType() {
     for (var _i = 0; _i < arguments.length; _i++) {
         options[_i] = arguments[_i];
     }
-    return function (type) {
+    return function (type, context) {
         FieldType.apply(void 0, tslib_1.__spread([function (o) {
-                o.valueConverter = ValueListInfo.get(type),
-                    o.displayValue = function (item, val) { return val === null || val === void 0 ? void 0 : val.caption; };
-            }], options))(type);
+                ;
+                (o.valueConverter = ValueListInfo.get(type)),
+                    (o.displayValue = function (item, val) { return val === null || val === void 0 ? void 0 : val.caption; });
+            }], options))(type, context);
     };
 }
 exports.ValueListFieldType = ValueListFieldType;
@@ -2744,7 +2824,8 @@ var ValueListInfo = /** @class */ (function () {
                 throw new Error("ValueType " + this.valueListType + " has values without an id");
         }
         else
-            throw new Error("ValueType not yet initialized, did you forget to call @ValueListFieldType on " + valueListType);
+            throw new Error("ValueType not yet initialized, did you forget to call @ValueListFieldType on " +
+                valueListType);
     }
     ValueListInfo.get = function (type) {
         var r = typeCache.get(type);
@@ -2820,11 +2901,13 @@ exports.getValueList = getValueList;
  * title='';
  */
 function Field(valueType) {
+    // IMPORTANT!!!! if you call this in another decorator, make sure to set It's return type correctly with the | undefined
     var options = [];
     for (var _i = 1; _i < arguments.length; _i++) {
         options[_i - 1] = arguments[_i];
     }
-    return function (target, key, c) {
+    return function (target, context, c) {
+        var key = typeof context === 'string' ? context : context.name.toString();
         var factory = function (remult) {
             var r = buildOptions(options, remult);
             if (!r.valueType && valueType) {
@@ -2837,13 +2920,14 @@ function Field(valueType) {
                 r.dbName = r.key;
             var type = r.valueType;
             if (!type) {
-                type = Reflect.getMetadata("design:type", target, key);
+                type = Reflect.getMetadata('design:type', target, key);
                 r.valueType = type;
             }
             if (!r.target)
                 r.target = target;
             return r;
         };
+        checkTarget(target);
         var names = exports.columnsOfType.get(target.constructor);
         if (!names) {
             names = [];
@@ -2866,7 +2950,7 @@ function Field(valueType) {
     };
 }
 exports.Field = Field;
-exports.storableMember = Symbol("storableMember");
+exports.storableMember = Symbol('storableMember');
 function buildOptions(options, remult) {
     var e_39, _a;
     var r = {};
@@ -2874,7 +2958,7 @@ function buildOptions(options, remult) {
         for (var options_2 = tslib_1.__values(options), options_2_1 = options_2.next(); !options_2_1.done; options_2_1 = options_2.next()) {
             var o = options_2_1.value;
             if (o) {
-                if (typeof o === "function")
+                if (typeof o === 'function')
                     o(r, remult);
                 else
                     Object.assign(r, o);
@@ -2921,10 +3005,44 @@ function decorateColumnSettings(settings, remult) {
     if (!settings.valueConverter) {
         var ei = getEntitySettings(settings.valueType, false);
         if (ei) {
+            var isIdNumeric_1 = undefined;
             settings.valueConverter = {
                 toDb: function (x) { return x; },
-                fromDb: function (x) { return x; }
+                fromDb: function (x) { return x; },
             };
+            settings.valueConverter = new Proxy(settings.valueConverter, {
+                get: function (target, property) {
+                    var e_40, _a;
+                    if (target[property] === undefined) {
+                        if (isIdNumeric_1 === undefined) {
+                            isIdNumeric_1 =
+                                remult.repo(settings.valueType).metadata.idMetadata.field
+                                    .valueType === Number;
+                            try {
+                                for (var _b = tslib_1.__values([
+                                    'fieldTypeInDb',
+                                ]), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                    var key = _c.value;
+                                    //@ts-ignore
+                                    target[key] = valueConverters_1.ValueConverters.Integer[key];
+                                }
+                            }
+                            catch (e_40_1) { e_40 = { error: e_40_1 }; }
+                            finally {
+                                try {
+                                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                                }
+                                finally { if (e_40) throw e_40.error; }
+                            }
+                        }
+                    }
+                    return target[property];
+                },
+                set: function (target, property, value, receiver) {
+                    target[property] = value;
+                    return true;
+                },
+            });
         }
         else
             settings.valueConverter = valueConverters_1.ValueConverters.Default;
@@ -2945,11 +3063,14 @@ function decorateColumnSettings(settings, remult) {
         settings.valueConverter.toInput = function (x) { return settings.valueConverter.toJson(x); };
     }
     if (!settings.valueConverter.fromInput) {
-        settings.valueConverter.fromInput = function (x) { return settings.valueConverter.fromJson(x); };
+        settings.valueConverter.fromInput = function (x) {
+            return settings.valueConverter.fromJson(x);
+        };
     }
     return settings;
 }
 exports.decorateColumnSettings = decorateColumnSettings;
+//[ ] YONI - in Typescript 5 I do get the name of the class, what would we like to change because of that?
 /**Decorates classes that should be used as entities.
  * Receives a key and an array of EntityOptions.
  * @example
@@ -2979,7 +3100,7 @@ function Entity(key) {
     for (var _i = 1; _i < arguments.length; _i++) {
         options[_i - 1] = arguments[_i];
     }
-    return function (target) {
+    return function (target, info) {
         var _a;
         for (var rawFilterMember in target) {
             if (Object.prototype.hasOwnProperty.call(target, rawFilterMember)) {
@@ -2991,25 +3112,25 @@ function Entity(key) {
             }
         }
         var factory = function (remult) {
-            var e_40, _a;
+            var e_41, _a;
             var r = {};
             try {
                 for (var options_3 = tslib_1.__values(options), options_3_1 = options_3.next(); !options_3_1.done; options_3_1 = options_3.next()) {
                     var o = options_3_1.value;
                     if (o) {
-                        if (typeof o === "function")
+                        if (typeof o === 'function')
                             o(r, remult);
                         else
                             Object.assign(r, o);
                     }
                 }
             }
-            catch (e_40_1) { e_40 = { error: e_40_1 }; }
+            catch (e_41_1) { e_41 = { error: e_41_1 }; }
             finally {
                 try {
                     if (options_3_1 && !options_3_1.done && (_a = options_3.return)) _a.call(options_3);
                 }
-                finally { if (e_40) throw e_40.error; }
+                finally { if (e_41) throw e_41.error; }
             }
             var base = Object.getPrototypeOf(target);
             if (base) {
@@ -3035,19 +3156,29 @@ var EntityBase = /** @class */ (function () {
     function EntityBase() {
     }
     Object.defineProperty(EntityBase.prototype, "_", {
-        get: function () { return getEntityRef(this); },
+        get: function () {
+            return getEntityRef(this);
+        },
         enumerable: false,
         configurable: true
     });
-    EntityBase.prototype.save = function () { return this._.save(); };
+    EntityBase.prototype.save = function () {
+        return this._.save();
+    };
     EntityBase.prototype.assign = function (values) {
         assign_1.assign(this, values);
         return this;
     };
-    EntityBase.prototype.delete = function () { return this._.delete(); };
-    EntityBase.prototype.isNew = function () { return this._.isNew(); };
+    EntityBase.prototype.delete = function () {
+        return this._.delete();
+    };
+    EntityBase.prototype.isNew = function () {
+        return this._.isNew();
+    };
     Object.defineProperty(EntityBase.prototype, "$", {
-        get: function () { return this._.fields; },
+        get: function () {
+            return this._.fields;
+        },
         enumerable: false,
         configurable: true
     });
@@ -3075,12 +3206,16 @@ var ControllerBase = /** @class */ (function () {
         return this;
     };
     Object.defineProperty(ControllerBase.prototype, "$", {
-        get: function () { return getFields(this, this.remult); },
+        get: function () {
+            return getFields(this, this.remult);
+        },
         enumerable: false,
         configurable: true
     });
     Object.defineProperty(ControllerBase.prototype, "_", {
-        get: function () { return getControllerRef(this, this.remult); },
+        get: function () {
+            return getControllerRef(this, this.remult);
+        },
         enumerable: false,
         configurable: true
     });
@@ -3108,7 +3243,7 @@ var QueryResultImpl = /** @class */ (function () {
                         orderBy: this.options.orderBy,
                         limit: this.options.pageSize,
                         page: page,
-                        load: this.options.load
+                        load: this.options.load,
                     })];
             });
         });
@@ -3131,9 +3266,9 @@ var QueryResultImpl = /** @class */ (function () {
         });
     };
     QueryResultImpl.prototype.forEach = function (what) {
-        var e_41, _a;
+        var e_42, _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var i, _b, _c, x, e_41_1;
+            var i, _b, _c, x, e_42_1;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -3155,8 +3290,8 @@ var QueryResultImpl = /** @class */ (function () {
                     case 5: return [3 /*break*/, 2];
                     case 6: return [3 /*break*/, 13];
                     case 7:
-                        e_41_1 = _d.sent();
-                        e_41 = { error: e_41_1 };
+                        e_42_1 = _d.sent();
+                        e_42 = { error: e_42_1 };
                         return [3 /*break*/, 13];
                     case 8:
                         _d.trys.push([8, , 11, 12]);
@@ -3167,7 +3302,7 @@ var QueryResultImpl = /** @class */ (function () {
                         _d.label = 10;
                     case 10: return [3 /*break*/, 12];
                     case 11:
-                        if (e_41) throw e_41.error;
+                        if (e_42) throw e_42.error;
                         return [7 /*endfinally*/];
                     case 12: return [7 /*endfinally*/];
                     case 13: return [2 /*return*/, i];
@@ -3184,10 +3319,12 @@ var QueryResultImpl = /** @class */ (function () {
                     case 0:
                         this.options.orderBy = sort_1.Sort.createUniqueEntityOrderBy(this.repo.metadata, this.options.orderBy);
                         return [4 /*yield*/, this.repo.find({
-                                where: { $and: [this.options.where, pNextPageFilter] },
+                                where: {
+                                    $and: [this.options.where, pNextPageFilter],
+                                },
                                 orderBy: this.options.orderBy,
                                 limit: this.options.pageSize,
-                                load: this.options.load
+                                load: this.options.load,
                             })];
                     case 1:
                         items = _a.sent();
@@ -3203,7 +3340,7 @@ var QueryResultImpl = /** @class */ (function () {
                             count: function () { return _this.count(); },
                             hasNextPage: hasNextPage,
                             items: items,
-                            nextPage: nextPage
+                            nextPage: nextPage,
                         }];
                 }
             });
@@ -3253,8 +3390,9 @@ var QueryResultImpl = /** @class */ (function () {
                         }
                         else {
                             if ((prev === null || prev === void 0 ? void 0 : prev.items.length) > 0) {
-                                if (this.repo.getEntityRef(prev.items[0]).getId() == this.repo.getEntityRef(currentPage.items[0]).getId())
-                                    throw new Error("pagination failure, returned same first row");
+                                if (this.repo.getEntityRef(prev.items[0]).getId() ==
+                                    this.repo.getEntityRef(currentPage.items[0]).getId())
+                                    throw new Error('pagination failure, returned same first row');
                             }
                         }
                         _d.label = 7;
@@ -3272,7 +3410,7 @@ var QueryResultImpl = /** @class */ (function () {
                     r = itStrategy();
                     return [2 /*return*/, r];
                 });
-            }); }
+            }); },
         };
     };
     return QueryResultImpl;
@@ -3297,10 +3435,10 @@ var SubscribableImp = /** @class */ (function () {
     SubscribableImp.prototype.subscribe = function (listener) {
         var _this = this;
         var list;
-        if (typeof listener === "function")
+        if (typeof listener === 'function')
             list = {
                 reportChanged: function () { return listener(); },
-                reportObserved: function () { }
+                reportObserved: function () { },
             };
         else
             list = listener;
@@ -3308,7 +3446,9 @@ var SubscribableImp = /** @class */ (function () {
             this._subscribers = [];
         }
         this._subscribers.push(list);
-        return function () { return _this._subscribers = _this._subscribers.filter(function (x) { return x != list; }); };
+        return function () {
+            return (_this._subscribers = _this._subscribers.filter(function (x) { return x != list; }));
+        };
     };
     return SubscribableImp;
 }());
@@ -3317,7 +3457,7 @@ function getEntityMetadata(entity) {
         return entity.metadata;
     var settings = getEntitySettings(entity, false);
     if (settings) {
-        return remult_proxy_1.RemultProxy.defaultRemult.repo(entity).metadata;
+        return remult_proxy_1.remult.repo(entity).metadata;
     }
     return entity;
 }
@@ -3325,8 +3465,13 @@ exports.getEntityMetadata = getEntityMetadata;
 function getRepository(entity) {
     var settings = getEntitySettings(entity, false);
     if (settings) {
-        return remult_proxy_1.RemultProxy.defaultRemult.repo(entity);
+        return remult_proxy_1.remult.repo(entity);
     }
     return entity;
 }
 exports.getRepository = getRepository;
+function checkTarget(target) {
+    if (!target)
+        throw new Error("Set the 'experimentalDecorators:true' option in your 'tsconfig' or 'jsconfig' (target undefined)");
+}
+exports.checkTarget = checkTarget;