remult 0.21.1 → 0.22.0

package/esm/src/remult3/RepositoryImplementation.js

@@ -1,14 +1,15 @@
 import { __decorate, __metadata } from "tslib";
 import { CompoundIdField, LookupColumn, makeTitle } from '../column';
-import { allEntities, Remult, isBackend, queryConfig as queryConfig, setControllerSettings } from "../context";
-import { entityFilterToJson, Filter } from "../filter/filter-interfaces";
-import { Sort } from "../sort";
+import { allEntities, Remult, isBackend, queryConfig as queryConfig, setControllerSettings, } from '../context';
+import { Filter, } from '../filter/filter-interfaces';
+import { Sort } from '../sort';
 import { v4 as uuid } from 'uuid';
-import cuid from 'cuid';
-import { ValueConverters } from "../valueConverters";
-import { filterHelper } from "../filter/filter-interfaces";
-import { assign } from "../../assign";
-import { remult as defaultRemult, RemultProxy } from "../remult-proxy";
+import { createId } from '@paralleldrive/cuid2';
+import { ValueConverters } from '../valueConverters';
+import { filterHelper } from '../filter/filter-interfaces';
+import { assign } from '../../assign';
+import { remult as defaultRemult } from '../remult-proxy';
+import { findOptionsToJson } from '../data-providers/rest-data-provider';
 //import { remult } from "../remult-proxy";
 let classValidatorValidate = undefined;
 // import("class-validator".toString())
@@ -39,7 +40,8 @@ export class RepositoryImplementation {
     }
     async createAfterFilter(orderBy, lastRow) {
         let values = new Map();
-        for (const s of Sort.translateOrderByToSort(this.metadata, orderBy).Segments) {
+        for (const s of Sort.translateOrderByToSort(this.metadata, orderBy)
+            .Segments) {
             let existingVal = lastRow[s.field.key];
             // if (typeof existingVal !== "string" && typeof existingVal !== "number") {
             // }
@@ -53,7 +55,8 @@ export class RepositoryImplementation {
         }
         let r = { $or: [] };
         let equalToColumn = [];
-        for (const s of Sort.translateOrderByToSort(this.metadata, orderBy).Segments) {
+        for (const s of Sort.translateOrderByToSort(this.metadata, orderBy)
+            .Segments) {
             let ff = new filterHelper(s.field);
             let f = {};
             for (const c of equalToColumn) {
@@ -70,7 +73,9 @@ export class RepositoryImplementation {
         return r;
     }
     get edp() {
-        return this.__edp ? this.__edp : this.__edp = this.dataProvider.getEntityDataProvider(this.metadata);
+        return this.__edp
+            ? this.__edp
+            : (this.__edp = this.dataProvider.getEntityDataProvider(this.metadata));
     }
     getCachedById(id) {
         id = id + '';
@@ -89,7 +94,7 @@ export class RepositoryImplementation {
             return r;
         }
         this.idCache.set(id, undefined);
-        let row = this.findId(id).then(row => {
+        let row = this.findId(id).then((row) => {
             if (row === undefined) {
                 r = null;
             }
@@ -106,8 +111,9 @@ export class RepositoryImplementation {
         if (item)
             this.idCache.set(this.getEntityRef(item).getId() + '', item);
     }
-    get metadata() { return this._info; }
-    ;
+    get metadata() {
+        return this._info;
+    }
     addEventListener(listener) {
         if (!this.listeners)
             this.listeners = [];
@@ -125,14 +131,15 @@ export class RepositoryImplementation {
             this.fixTypes(entity);
             x = new rowHelperImplementation(this._info, entity, this, this.edp, this.remult, true);
             Object.defineProperty(entity, entityMember, {
-                get: () => x
+                //I've used define property to hide this member from console.lo g
+                get: () => x,
             });
             x.saveOriginalData();
         }
         return x;
     }
     async delete(item) {
-        if (typeof item === "string" || typeof item === "number")
+        if (typeof item === 'string' || typeof item === 'number')
             return this.edp.delete(item);
         else {
             return this.getRefForExistingRow(item, undefined).delete();
@@ -150,7 +157,7 @@ export class RepositoryImplementation {
             let ref = getEntityRef(entity, false);
             if (ref) {
                 if (!ref.isNew())
-                    throw "Item is not new";
+                    throw 'Item is not new';
                 return await ref.save();
             }
             else {
@@ -163,7 +170,9 @@ export class RepositoryImplementation {
     }
     async validate(entity, ...fields) {
         {
-            let ref = this.getEntityRef(entity);
+            let ref = getEntityRef(entity, false);
+            if (!ref)
+                ref = this.getEntityRef({ ...entity });
             if (!fields || fields.length === 0) {
                 return await ref.validate();
             }
@@ -171,7 +180,7 @@ export class RepositoryImplementation {
                 ref.__clearErrorsAndReportChanged();
                 let hasError = false;
                 for (const f of fields) {
-                    if (!await ref.fields.find(f).validate())
+                    if (!(await ref.fields.find(f).validate()))
                         hasError = true;
                 }
                 if (!hasError)
@@ -193,7 +202,7 @@ export class RepositoryImplementation {
             }
             this.fixTypes(instance);
             let row = 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.id = id;
@@ -203,14 +212,14 @@ export class RepositoryImplementation {
                 row.id = row.getId();
             ref = row;
             Object.defineProperty(instance, entityMember, {
-                get: () => row
+                get: () => row,
             });
         }
         return ref;
     }
     async save(entity) {
         if (Array.isArray(entity)) {
-            return Promise.all(entity.map(x => this.save(x)));
+            return Promise.all(entity.map((x) => this.save(x)));
         }
         else {
             let ref = getEntityRef(entity, false);
@@ -233,17 +242,17 @@ export class RepositoryImplementation {
         return {
             subscribe: (l) => {
                 let listener = l;
-                if (typeof l === "function") {
+                if (typeof l === 'function') {
                     listener = {
                         next: l,
                         complete: () => { },
-                        error: () => { }
+                        error: () => { },
                     };
                 }
                 listener.error ??= () => { };
                 listener.complete ??= () => { };
                 return this.remult.liveQuerySubscriber.subscribe(this, options, listener);
-            }
+            },
         };
     }
     async find(options, skipOrderByAndLimit = false) {
@@ -272,7 +281,7 @@ export class RepositoryImplementation {
         return opt;
     }
     async fromJsonArray(jsonItems, load) {
-        return this.loadManyToOneForManyRows(jsonItems.map(row => {
+        return this.loadManyToOneForManyRows(jsonItems.map((row) => {
             let result = {};
             for (const col of this.metadata.fields.toArray()) {
                 result[col.key] = col.valueConverter.fromJson(row[col.key]);
@@ -295,7 +304,10 @@ export class RepositoryImplementation {
                     let toLoad = [];
                     for (const r of rawRows) {
                         let 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);
                         }
                     }
@@ -320,28 +332,54 @@ export class RepositoryImplementation {
         let x = new this.entity(this.remult);
         let helper = new rowHelperImplementation(this._info, x, this, this.edp, this.remult, false);
         Object.defineProperty(x, entityMember, {
-            get: () => helper
+            //I've used define property to hide this member from console.lo g
+            get: () => helper,
         });
         await helper.loadDataFrom(r, loadFields);
         helper.saveOriginalData();
         return x;
     }
-    // TODO2 - consider replacing with fromJsonArray - also consider having a TOJSON for similar cases
-    async fromJson(json, newRow) {
-        let obj = {};
+    toJson(item) {
+        if (item === undefined || item === null)
+            return item;
+        if (Array.isArray(item))
+            return item.map((x) => this.toJson(x));
+        if (typeof item.then === 'function')
+            return item.then((x) => this.toJson(x));
+        return this.getEntityRef(item).toApiJson(true);
+    }
+    fromJson(json, newRow) {
+        if (json === null || json === undefined)
+            return json;
+        if (Array.isArray(json))
+            return json.map((item) => this.fromJson(item, newRow));
+        let result = new this.entity(this.remult);
         for (const col of this.fieldsOf(json)) {
-            if (json[col.key] !== undefined) {
-                obj[col.key] = col.valueConverter.fromJson(json[col.key]);
+            let 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]);
+                }
             }
         }
+        this.fixTypes(result);
         if (newRow) {
-            let r = this.create();
-            let helper = this.getEntityRef(r);
-            await helper.loadDataFrom(obj);
-            return r;
+            return this.create(result);
+        }
+        else {
+            let row = 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: () => row,
+            });
+            row.saveOriginalData();
+            return result;
         }
-        else
-            return this.mapRawDataToResult(obj, undefined);
     }
     async count(where) {
         return this.edp.count(await this.translateWhereToFilter(where));
@@ -353,10 +391,7 @@ export class RepositoryImplementation {
             if (options.where) {
                 let w = options.where;
                 options.where = {
-                    $and: [
-                        w,
-                        where
-                    ]
+                    $and: [w, where],
                 };
             }
             else
@@ -365,11 +400,12 @@ export class RepositoryImplementation {
         let r;
         let cacheInfo;
         if (options.useCache) {
-            let f = await entityFilterToJson(this.metadata, options.where);
+            let f = findOptionsToJson(options, this.metadata);
             let key = JSON.stringify(f);
             cacheInfo = this.cache.get(key);
             if (cacheInfo !== undefined) {
-                if (cacheInfo.value && this.getEntityRef(cacheInfo.value).wasDeleted()) {
+                if (cacheInfo.value &&
+                    this.getEntityRef(cacheInfo.value).wasDeleted()) {
                     cacheInfo = undefined;
                     this.cache.delete(key);
                 }
@@ -379,7 +415,7 @@ export class RepositoryImplementation {
             else {
                 cacheInfo = {
                     value: undefined,
-                    promise: undefined
+                    promise: undefined,
                 };
                 this.cache.set(key, cacheInfo);
             }
@@ -397,7 +433,7 @@ export class RepositoryImplementation {
             return r;
         });
         if (cacheInfo) {
-            cacheInfo.promise = r = r.then(r => {
+            cacheInfo.promise = r = r.then((r) => {
                 cacheInfo.value = r;
                 return r;
             });
@@ -406,7 +442,7 @@ export class RepositoryImplementation {
     }
     fieldsOf(item) {
         let keys = Object.keys(item);
-        return this.metadata.fields.toArray().filter(x => keys.includes(x.key));
+        return this.metadata.fields.toArray().filter((x) => keys.includes(x.key));
     }
     create(item) {
         let r = new this.entity(this.remult);
@@ -426,7 +462,11 @@ export class RepositoryImplementation {
                 if (field.valueType === Date && !(val instanceof Date))
                     item[field.key] = field.valueConverter.fromJson(field.valueConverter.toJson(val));
                 else
-                    for (const [type, typeName] of [[String, "string"], [Number, "number"], [Boolean, "boolean"]]) {
+                    for (const [type, typeName] of [
+                        [String, 'string'],
+                        [Number, 'number'],
+                        [Boolean, 'boolean'],
+                    ]) {
                         if (field.valueType === type && typeof val !== typeName)
                             item[field.key] = field.valueConverter.fromJson(field.valueConverter.toJson(val));
                     }
@@ -437,8 +477,8 @@ export class RepositoryImplementation {
     findId(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({}, {
             useCache: true,
             ...options,
@@ -450,13 +490,11 @@ export class RepositoryImplementation {
         if (this.metadata.options.backendPrefilter && isBackend()) {
             let z = where;
             where = {
-                $and: [
-                    z, await Filter.resolve(this.metadata.options.backendPrefilter)
-                ]
+                $and: [z, await Filter.resolve(this.metadata.options.backendPrefilter)],
             };
         }
         let r = await Filter.fromEntityFilter(this.metadata, where);
-        if (r && !this.dataProvider.supportsRawFilter) {
+        if (r && !this.dataProvider.isProxy) {
             r = await Filter.translateCustomWhere(r, this.metadata, this.remult);
         }
         return r;
@@ -481,23 +519,24 @@ export function __updateEntityBasedOnWhere(entityDefs, where, r) {
             isLessThan: emptyFunction,
             isNotNull: emptyFunction,
             isNull: emptyFunction,
-            or: emptyFunction
+            or: emptyFunction,
         });
     }
 }
-export const entityInfo = Symbol("entityInfo");
-export const entityInfo_key = Symbol("entityInfo_key");
-const entityMember = Symbol("entityMember");
+export const entityInfo = Symbol('entityInfo');
+export const entityInfo_key = Symbol('entityInfo_key');
+const entityMember = Symbol('entityMember');
 export function getEntitySettings(entity, 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;
     let info = Reflect.getMetadata(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;
 }
 export function getEntityKey(entity) {
@@ -507,20 +546,26 @@ export const columnsOfType = new Map();
 export function createOldEntity(entity, remult) {
     let r = columnsOfType.get(entity);
     if (!r)
-        columnsOfType.set(entity, r = []);
+        columnsOfType.set(entity, (r = []));
     let info = getEntitySettings(entity)(remult);
     let key = getEntityKey(entity);
     let base = Object.getPrototypeOf(entity);
     while (base != null) {
         let baseCols = columnsOfType.get(base);
         if (baseCols) {
-            r.unshift(...baseCols.filter(x => !r.find(y => y.key == x.key)));
+            r.unshift(...baseCols.filter((x) => !r.find((y) => y.key == x.key)));
         }
         let baseSettingsFactory = getEntitySettings(base, false);
         if (baseSettingsFactory) {
             let baseSettings = baseSettingsFactory(remult);
             info = { ...baseSettings, ...info };
-            let functions = ["saving", "saved", "deleting", "deleted", "validation"];
+            let functions = [
+                'saving',
+                'saved',
+                'deleting',
+                'deleted',
+                'validation',
+            ];
             for (const key of functions) {
                 if (baseSettings[key] && baseSettings[key] !== info[key]) {
                     let x = info[key];
@@ -581,7 +626,7 @@ class rowHelperBase {
                         }
                         refImpl._subscribers.reportChanged();
                     },
-                    enumerable: true
+                    enumerable: true,
                 });
                 lookup.set(val);
             }
@@ -604,7 +649,6 @@ class rowHelperBase {
     initSubscribers() {
         if (!this._subscribers) {
             this._subscribers = new SubscribableImp();
-            ;
             for (const col of this.columnsInfo) {
                 let ei = getEntitySettings(col.valueType, false);
                 let refImpl = this.fields.find(col.key);
@@ -624,7 +668,7 @@ class rowHelperBase {
                             this._subscribers.reportChanged();
                             refImpl._subscribers.reportChanged();
                         },
-                        enumerable: true
+                        enumerable: true,
                     });
                 }
             }
@@ -639,7 +683,7 @@ class rowHelperBase {
         this._subscribers?.reportChanged();
     }
     async waitLoad() {
-        await Promise.all([...this.lookups.values()].map(x => x.waitLoad()));
+        await Promise.all([...this.lookups.values()].map((x) => x.waitLoad()));
     }
     __assertValidity() {
         if (!this.hasErrors())
@@ -648,12 +692,13 @@ class rowHelperBase {
     buildErrorInfoObject() {
         let error = {
             modelState: Object.assign({}, this.errors),
-            message: this.error
+            message: this.error,
         };
         if (!error.message) {
             for (const col of this.columnsInfo) {
                 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;
                 }
@@ -664,7 +709,7 @@ class rowHelperBase {
     catchSaveErrors(err) {
         let e = err;
         if (e instanceof Promise) {
-            return e.then(x => this.catchSaveErrors(x));
+            return e.then((x) => this.catchSaveErrors(x));
         }
         if (e.error) {
             e = e.error;
@@ -723,8 +768,7 @@ class rowHelperBase {
         this.originalValues = this.copyDataToObject();
         this.saveMoreOriginalData();
     }
-    saveMoreOriginalData() {
-    }
+    saveMoreOriginalData() { }
     async validate() {
         this.__clearErrorsAndReportChanged();
         if (classValidatorValidate)
@@ -743,16 +787,20 @@ class rowHelperBase {
         await this.__performColumnAndEntityValidations();
         this.__assertValidity();
     }
-    async __performColumnAndEntityValidations() {
-    }
-    toApiJson() {
+    async __performColumnAndEntityValidations() { }
+    toApiJson(includeRelatedEntities = false) {
         let result = {};
         for (const col of this.columnsInfo) {
-            if (!this.remult || col.includeInApi === undefined || this.remult.isAllowed(col.includeInApi)) {
+            if (!this.remult ||
+                col.includeInApi === undefined ||
+                this.remult.isAllowed(col.includeInApi)) {
                 let val;
                 let 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) {
@@ -773,8 +821,11 @@ class rowHelperBase {
         let keys = Object.keys(body);
         for (const col of this.columnsInfo) {
             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)) {
                         let lu = this.lookups.get(col.key);
                         if (lu)
                             lu.id = body[col.key];
@@ -783,7 +834,7 @@ class rowHelperBase {
                     }
                 }
         }
-        await Promise.all([...this.fields].map(x => x.load()));
+        await Promise.all([...this.fields].map((x) => x.load()));
     }
 }
 export class rowHelperImplementation extends rowHelperBase {
@@ -799,7 +850,7 @@ export class rowHelperImplementation extends rowHelperBase {
         if (_isNew) {
             for (const col of info.columnsInfo) {
                 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])
@@ -812,9 +863,15 @@ export class rowHelperImplementation extends rowHelperBase {
         if (Remult.entityRefInit)
             Remult.entityRefInit(this, instance);
     }
-    get apiUpdateAllowed() { return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiUpdate); }
-    get apiDeleteAllowed() { return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiDelete); }
-    get apiInsertAllowed() { return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiInsert); }
+    get apiUpdateAllowed() {
+        return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiUpdate);
+    }
+    get apiDeleteAllowed() {
+        return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiDelete);
+    }
+    get apiInsertAllowed() {
+        return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiInsert);
+    }
     getId() {
         return this.info.idMetadata.getId(this.instance);
     }
@@ -841,12 +898,12 @@ export class rowHelperImplementation extends rowHelperBase {
         if (!this._columns) {
             let _items = [];
             let r = {
-                find: (c) => r[typeof c === "string" ? c : c.key],
+                find: (c) => r[typeof c === 'string' ? c : c.key],
                 [Symbol.iterator]: () => _items[Symbol.iterator](),
-                toArray: () => _items
+                toArray: () => _items,
             };
             for (const c of this.info.columnsInfo) {
-                _items.push(r[c.key] = new FieldRefImplementation(c, this.info.fields[c.key], this.instance, this, this));
+                _items.push((r[c.key] = new FieldRefImplementation(c, this.info.fields[c.key], this.instance, this, this)));
             }
             this._columns = r;
         }
@@ -855,10 +912,10 @@ export class rowHelperImplementation extends rowHelperBase {
     async save() {
         try {
             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;
             await this.__validateEntity();
             let doNotSave = false;
@@ -867,7 +924,7 @@ export class rowHelperImplementation extends rowHelperBase {
                     await col.metadata.options.saving(this.instance, col);
             }
             if (this.info.entityInfo.saving) {
-                await this.info.entityInfo.saving(this.instance, () => doNotSave = true);
+                await this.info.entityInfo.saving(this.instance, () => (doNotSave = true));
             }
             this.__assertValidity();
             let d = this.copyDataToObject();
@@ -881,7 +938,7 @@ export class rowHelperImplementation extends rowHelperBase {
                 }
             }
             if (this.info.idMetadata.field instanceof CompoundIdField)
-                delete (d.id);
+                delete d.id;
             let updatedRow;
             let isNew = this.isNew();
             try {
@@ -895,7 +952,8 @@ export class rowHelperImplementation extends rowHelperBase {
                     for (const key in d) {
                         if (Object.prototype.hasOwnProperty.call(d, key)) {
                             const 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;
                             }
@@ -914,7 +972,7 @@ export class rowHelperImplementation extends rowHelperBase {
                 if (this.info.entityInfo.saved)
                     await this.info.entityInfo.saved(this.instance);
                 if (this.repository.listeners)
-                    for (const listener of this.repository.listeners.filter(x => x.saved)) {
+                    for (const listener of this.repository.listeners.filter((x) => x.saved)) {
                         await listener.saved(this.instance, isNew);
                     }
                 await this.repository.remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }]);
@@ -945,7 +1003,7 @@ export class rowHelperImplementation extends rowHelperBase {
             if (this.info.entityInfo.deleted)
                 await this.info.entityInfo.deleted(this.instance);
             if (this.repository.listeners)
-                for (const listener of this.repository.listeners.filter(x => x.deleted)) {
+                for (const listener of this.repository.listeners.filter((x) => x.deleted)) {
                     await listener.deleted(this.instance);
                 }
             await this.repository.remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: true }]);
@@ -1008,14 +1066,14 @@ export class rowHelperImplementation extends rowHelperBase {
         if (this.info.entityInfo.validation)
             await this.info.entityInfo.validation(this.instance, this);
         if (this.repository.listeners)
-            for (const listener of this.repository.listeners.filter(x => x.validating)) {
+            for (const listener of this.repository.listeners.filter((x) => x.validating)) {
                 await listener.validating(this.instance);
             }
     }
 }
-const controllerColumns = Symbol("controllerColumns");
+const controllerColumns = Symbol('controllerColumns');
 function prepareColumnInfo(r, remult) {
-    return r.map(x => decorateColumnSettings(x.settings(remult), remult));
+    return r.map((x) => decorateColumnSettings(x.settings(remult), remult));
 }
 export function getFields(container, remult) {
     return getControllerRef(container, remult).fields;
@@ -1028,12 +1086,12 @@ export function getControllerRef(container, remultArg) {
     if (!result) {
         let columnSettings = columnsOfType.get(container.constructor);
         if (!columnSettings)
-            columnsOfType.set(container.constructor, columnSettings = []);
+            columnsOfType.set(container.constructor, (columnSettings = []));
         let base = Object.getPrototypeOf(container.constructor);
         while (base != null) {
             let baseCols = columnsOfType.get(base);
             if (baseCols) {
-                columnSettings.unshift(...baseCols.filter(x => !columnSettings.find(y => y.key == x.key)));
+                columnSettings.unshift(...baseCols.filter((x) => !columnSettings.find((y) => y.key == x.key)));
             }
             base = Object.getPrototypeOf(base);
         }
@@ -1046,12 +1104,12 @@ export class controllerRefImpl extends rowHelperBase {
         super(columnsInfo, instance, remult);
         let _items = [];
         let r = {
-            find: (c) => r[typeof c === "string" ? c : c.key],
+            find: (c) => r[typeof c === 'string' ? c : c.key],
             [Symbol.iterator]: () => _items[Symbol.iterator](),
-            toArray: () => _items
+            toArray: () => _items,
         };
         for (const col of columnsInfo) {
-            _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)));
         }
         this.fields = r;
     }
@@ -1132,13 +1190,14 @@ export class FieldRefImplementation {
             else
                 return this.value.toString();
         }
-        return "";
+        return '';
+    }
+    get value() {
+        return this.container[this.metadata.key];
+    }
+    set value(value) {
+        this.container[this.metadata.key] = value;
     }
-    ;
-    get value() { return this.container[this.metadata.key]; }
-    ;
-    set value(value) { this.container[this.metadata.key] = value; }
-    ;
     get originalValue() {
         this.reportObserved();
         let lu = this.rowBase.lookups.get(this.metadata.key);
@@ -1146,7 +1205,6 @@ export class FieldRefImplementation {
             return lu.get(this.rawOriginalValue());
         return this.rowBase.originalValues[this.metadata.key];
     }
-    ;
     rawOriginalValue() {
         return this.rowBase.originalValues[this.metadata.key];
     }
@@ -1174,7 +1232,6 @@ export class FieldRefImplementation {
         else
             this.value = this.metadata.valueConverter.fromInput(val, this.settings.inputType);
     }
-    ;
     valueChanged() {
         this.reportObserved();
         let val = this.value;
@@ -1182,11 +1239,11 @@ export class FieldRefImplementation {
         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)));
     }
     async __performValidation() {
         try {
-            let x = typeof (this.settings.validate);
+            let x = typeof this.settings.validate;
             if (Array.isArray(this.settings.validate)) {
                 for (const v of this.settings.validate) {
                     await v(this.container, this);
@@ -1196,7 +1253,7 @@ export class FieldRefImplementation {
                 await this.settings.validate(this.container, this);
         }
         catch (error) {
-            if (typeof error === "string")
+            if (typeof error === 'string')
                 this.error = error;
             else
                 this.error = error.message;
@@ -1210,15 +1267,17 @@ export class FieldRefImplementation {
 export function getEntityRef(entity, throwException = true) {
     let 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;
 }
 export const CaptionTransformer = {
-    transformCaption: (remult, key, caption) => caption
+    transformCaption: (remult, key, caption) => caption,
 };
 export function buildCaption(caption, key, remult) {
     let result;
-    if (typeof (caption) === "function") {
+    if (typeof caption === 'function') {
         if (remult)
             result = caption(remult);
     }
@@ -1240,12 +1299,12 @@ export class columnDefsImpl {
         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;
@@ -1257,7 +1316,9 @@ export class columnDefsImpl {
         return this.remult.isAllowedForInstance(item, this.options.allowApiUpdate);
     }
     displayValue(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;
     }
     get includedInApi() {
         if (this.options.includeInApi === undefined)
@@ -1274,7 +1335,7 @@ export class columnDefsImpl {
         try {
             if (this.settings.sqlExpression) {
                 let result;
-                if (typeof this.settings.sqlExpression === "function") {
+                if (typeof this.settings.sqlExpression === 'function') {
                     result = await this.settings.sqlExpression(this.entityDefs);
                 }
                 else
@@ -1291,7 +1352,7 @@ export class columnDefsImpl {
     get dbName() {
         let result;
         if (this.settings.sqlExpression) {
-            if (typeof this.settings.sqlExpression === "function") {
+            if (typeof this.settings.sqlExpression === 'function') {
                 result = this.settings.sqlExpression(this.entityDefs);
             }
             else
@@ -1304,7 +1365,6 @@ export class columnDefsImpl {
     get dbReadOnly() {
         return this.settings.dbReadOnly;
     }
-    ;
 }
 class EntityFullInfo {
     constructor(columnsInfo, entityInfo, remult, entityType, key) {
@@ -1313,9 +1373,8 @@ class EntityFullInfo {
         this.remult = remult;
         this.entityType = entityType;
         this.key = key;
-        this.options = this.entityInfo;
         this.idMetadata = {
-            getId: item => {
+            getId: (item) => {
                 if (this.idMetadata.field instanceof CompoundIdField)
                     return this.idMetadata.field.getId(item);
                 else
@@ -1325,7 +1384,7 @@ class EntityFullInfo {
             createIdInFilter: (items) => {
                 if (items.length > 0)
                     return {
-                        $or: items.map(x => this.idMetadata.getIdFilter(getEntityRef(x).getId()))
+                        $or: items.map((x) => this.idMetadata.getIdFilter(getEntityRef(x).getId())),
                     };
             },
             isIdField: (col) => {
@@ -1335,26 +1394,32 @@ class EntityFullInfo {
                 if (this.idMetadata.field instanceof CompoundIdField) {
                     let field = this.idMetadata.field;
                     return {
-                        $or: ids.map(x => field.isEqualTo(x))
+                        $or: ids.map((x) => field.isEqualTo(x)),
                     };
                 }
                 if (ids.length == 1)
                     return {
-                        [this.idMetadata.field.key]: ids[0]
+                        [this.idMetadata.field.key]: ids[0],
                     };
                 else
                     return {
-                        [this.idMetadata.field.key]: ids
+                        [this.idMetadata.field.key]: ids,
                     };
-            }
+            },
         };
+        this.options = entityInfo;
         if (this.options.allowApiCrud !== undefined) {
+            let crud;
+            if (typeof this.options.allowApiCrud === 'function')
+                crud = (_, remult) => 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;
         }
@@ -1366,12 +1431,12 @@ class EntityFullInfo {
             entityInfo.dbName = this.key;
         let _items = [];
         let r = {
-            find: (c) => r[typeof c === "string" ? c : c.key],
+            find: (c) => r[typeof c === 'string' ? c : c.key],
             [Symbol.iterator]: () => _items[Symbol.iterator](),
-            toArray: () => _items
+            toArray: () => _items,
         };
         for (const x of columnsInfo) {
-            _items.push(r[x.key] = new columnDefsImpl(x, this, remult));
+            _items.push((r[x.key] = new columnDefsImpl(x, this, remult)));
         }
         this.fields = r;
         this.caption = buildCaption(entityInfo.caption, this.key, remult);
@@ -1387,8 +1452,8 @@ class EntityFullInfo {
                 this.idMetadata.field = r;
         }
         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 = [...this.fields][0];
         }
@@ -1396,7 +1461,9 @@ class EntityFullInfo {
     apiUpdateAllowed(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;
     }
     get apiReadAllowed() {
         if (this.options.allowApiRead === undefined)
@@ -1406,12 +1473,22 @@ class EntityFullInfo {
     apiDeleteAllowed(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;
     }
     apiInsertAllowed(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;
+    }
+    getEntityMetadataWithoutBreakingTheEntity(item) {
+        let result = getEntityRef(item, false);
+        if (result)
+            return result;
+        return this.remult.repo(this.entityType).getEntityRef({ ...item });
     }
     getDbName() {
         if (this.dbNamePromise)
@@ -1419,16 +1496,16 @@ class EntityFullInfo {
         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') {
             let r = this.options.sqlExpression(this);
             if (r instanceof Promise)
                 this.dbNamePromise = r;
             else if (r)
                 this.dbNamePromise = Promise.resolve(r);
         }
-        this.dbNamePromise = this.dbNamePromise.then(x => {
+        this.dbNamePromise = this.dbNamePromise.then((x) => {
             if (!x)
                 return this.options.dbName;
             return x;
@@ -1437,7 +1514,7 @@ class EntityFullInfo {
     }
 }
 export function FieldType(...options) {
-    return target => {
+    return (target, context) => {
         if (!options) {
             options = [];
         }
@@ -1449,20 +1526,20 @@ export function FieldType(...options) {
 export class Fields {
     /**
      * Stored as a JSON.stringify - to store as json use Fields.json
-    */
+     */
     static object(...options) {
         return Field(undefined, ...options);
     }
     static json(...options) {
         return Field(undefined, {
             valueConverter: {
-                fieldTypeInDb: "json"
-            }
+                fieldTypeInDb: 'json',
+            },
         }, ...options);
     }
     static dateOnly(...options) {
         return Field(() => Date, {
-            valueConverter: ValueConverters.DateOnly
+            valueConverter: ValueConverters.DateOnly,
         }, ...options);
     }
     static date(...options) {
@@ -1470,14 +1547,17 @@ export class Fields {
     }
     static integer(...options) {
         return Field(() => Number, {
-            valueConverter: ValueConverters.Integer
+            valueConverter: ValueConverters.Integer,
         }, ...options);
     }
     static autoIncrement(...options) {
         return Field(() => Number, {
             allowApiUpdate: false,
             dbReadOnly: true,
-            valueConverter: { ...ValueConverters.Integer, fieldTypeInDb: 'autoincrement' }
+            valueConverter: {
+                ...ValueConverters.Integer,
+                fieldTypeInDb: 'autoincrement',
+            },
         }, ...options);
     }
     static number(...options) {
@@ -1489,7 +1569,7 @@ export class Fields {
             saving: (_, ref) => {
                 if (getEntityRef(_).isNew())
                     ref.value = new Date();
-            }
+            },
         }, ...options);
     }
     static updatedAt(...options) {
@@ -1497,7 +1577,7 @@ export class Fields {
             allowApiUpdate: false,
             saving: (_, ref) => {
                 ref.value = new Date();
-            }
+            },
         }, ...options);
     }
     static uuid(...options) {
@@ -1507,17 +1587,17 @@ export class Fields {
             saving: (_, r) => {
                 if (!r.value)
                     r.value = uuid();
-            }
+            },
         }, ...options);
     }
     static cuid(...options) {
         return Field(() => String, {
             allowApiUpdate: false,
-            defaultValue: () => cuid(),
+            defaultValue: () => createId(),
             saving: (_, r) => {
                 if (!r.value)
-                    r.value = cuid();
-            }
+                    r.value = createId();
+            },
         }, ...options);
     }
     static string(...options) {
@@ -1531,11 +1611,12 @@ export function isAutoIncrement(f) {
     return f.options?.valueConverter?.fieldTypeInDb === 'autoincrement';
 }
 export function ValueListFieldType(...options) {
-    return (type) => {
-        FieldType(o => {
-            o.valueConverter = ValueListInfo.get(type),
-                o.displayValue = (item, val) => val?.caption;
-        }, ...options)(type);
+    return (type, context) => {
+        FieldType((o) => {
+            ;
+            (o.valueConverter = ValueListInfo.get(type)),
+                (o.displayValue = (item, val) => val?.caption);
+        }, ...options)(type, context);
     };
 }
 export class ValueListInfo {
@@ -1566,18 +1647,19 @@ export class ValueListInfo {
                 if (op?.getValues) {
                     this.values.splice(0, this.values.length, ...op.getValues());
                     this.byIdMap.clear();
-                    this.values.forEach(s => {
+                    this.values.forEach((s) => {
                         if (s.caption === undefined && s.id !== undefined)
                             s.caption = makeTitle(s.id);
                         this.byIdMap.set(s.id, s);
                     });
                 }
             }
-            if (this.values.find(s => s.id === undefined))
+            if (this.values.find((s) => s.id === undefined))
                 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);
     }
     static get(type) {
         let r = typeCache.get(type);
@@ -1649,7 +1731,9 @@ export function getValueList(type) {
  * title='';
  */
 export function Field(valueType, ...options) {
-    return (target, key, c) => {
+    // IMPORTANT!!!! if you call this in another decorator, make sure to set It's return type correctly with the | undefined
+    return (target, context, c) => {
+        const key = typeof context === 'string' ? context : context.name.toString();
         let factory = (remult) => {
             let r = buildOptions(options, remult);
             if (!r.valueType && valueType) {
@@ -1662,19 +1746,20 @@ export function Field(valueType, ...options) {
                 r.dbName = r.key;
             let 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);
         let names = columnsOfType.get(target.constructor);
         if (!names) {
             names = [];
             columnsOfType.set(target.constructor, names);
         }
-        let set = names.find(x => x.key == key);
+        let set = names.find((x) => x.key == key);
         if (!set)
             names.push({
                 key,
@@ -1690,12 +1775,12 @@ export function Field(valueType, ...options) {
         }
     };
 }
-export const storableMember = Symbol("storableMember");
+export const storableMember = Symbol('storableMember');
 function buildOptions(options, remult) {
     let r = {};
     for (const o of options) {
         if (o) {
-            if (typeof o === "function")
+            if (typeof o === 'function')
                 o(r, remult);
             else
                 Object.assign(r, o);
@@ -1709,7 +1794,7 @@ export function decorateColumnSettings(settings, remult) {
         if (settingsOnTypeLevel) {
             settings = {
                 ...buildOptions(settingsOnTypeLevel, remult),
-                ...settings
+                ...settings,
             };
         }
     }
@@ -1737,34 +1822,58 @@ export function decorateColumnSettings(settings, remult) {
     if (!settings.valueConverter) {
         let ei = getEntitySettings(settings.valueType, false);
         if (ei) {
+            let isIdNumeric = undefined;
             settings.valueConverter = {
-                toDb: x => x,
-                fromDb: x => x
+                toDb: (x) => x,
+                fromDb: (x) => x,
             };
+            settings.valueConverter = new Proxy(settings.valueConverter, {
+                get(target, property) {
+                    if (target[property] === undefined) {
+                        if (isIdNumeric === undefined) {
+                            isIdNumeric =
+                                remult.repo(settings.valueType).metadata.idMetadata.field
+                                    .valueType === Number;
+                            for (const key of [
+                                'fieldTypeInDb',
+                            ]) {
+                                //@ts-ignore
+                                target[key] = ValueConverters.Integer[key];
+                            }
+                        }
+                    }
+                    return target[property];
+                },
+                set(target, property, value, receiver) {
+                    target[property] = value;
+                    return true;
+                },
+            });
         }
         else
             settings.valueConverter = ValueConverters.Default;
     }
     if (!settings.valueConverter.toJson) {
-        settings.valueConverter.toJson = x => x;
+        settings.valueConverter.toJson = (x) => x;
     }
     if (!settings.valueConverter.fromJson) {
-        settings.valueConverter.fromJson = x => x;
+        settings.valueConverter.fromJson = (x) => x;
     }
     if (!settings.valueConverter.toDb) {
-        settings.valueConverter.toDb = x => settings.valueConverter.toJson(x);
+        settings.valueConverter.toDb = (x) => settings.valueConverter.toJson(x);
     }
     if (!settings.valueConverter.fromDb) {
-        settings.valueConverter.fromDb = x => settings.valueConverter.fromJson(x);
+        settings.valueConverter.fromDb = (x) => settings.valueConverter.fromJson(x);
     }
     if (!settings.valueConverter.toInput) {
-        settings.valueConverter.toInput = x => settings.valueConverter.toJson(x);
+        settings.valueConverter.toInput = (x) => settings.valueConverter.toJson(x);
     }
     if (!settings.valueConverter.fromInput) {
-        settings.valueConverter.fromInput = x => settings.valueConverter.fromJson(x);
+        settings.valueConverter.fromInput = (x) => settings.valueConverter.fromJson(x);
     }
     return settings;
 }
+//[ ] 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
@@ -1790,7 +1899,7 @@ export function decorateColumnSettings(settings, remult) {
  * @Entity("tasks", (options,remult) => options.allowApiCrud = true)
  */
 export function Entity(key, ...options) {
-    return target => {
+    return (target, info) => {
         for (const rawFilterMember in target) {
             if (Object.prototype.hasOwnProperty.call(target, rawFilterMember)) {
                 const element = target[rawFilterMember];
@@ -1800,11 +1909,11 @@ export function Entity(key, ...options) {
                 }
             }
         }
-        let factory = remult => {
+        let factory = (remult) => {
             let r = {};
             for (const o of options) {
                 if (o) {
-                    if (typeof o === "function")
+                    if (typeof o === 'function')
                         o(r, remult);
                     else
                         Object.assign(r, o);
@@ -1818,7 +1927,7 @@ export function Entity(key, ...options) {
                     if (opt) {
                         r = {
                             ...opt,
-                            ...r
+                            ...r,
                         };
                     }
                 }
@@ -1833,15 +1942,25 @@ export function Entity(key, ...options) {
     };
 }
 export class EntityBase {
-    get _() { return getEntityRef(this); }
-    save() { return this._.save(); }
+    get _() {
+        return getEntityRef(this);
+    }
+    save() {
+        return this._.save();
+    }
     assign(values) {
         assign(this, values);
         return this;
     }
-    delete() { return this._.delete(); }
-    isNew() { return this._.isNew(); }
-    get $() { return this._.fields; }
+    delete() {
+        return this._.delete();
+    }
+    isNew() {
+        return this._.isNew();
+    }
+    get $() {
+        return this._.fields;
+    }
 }
 export class IdEntity extends EntityBase {
 }
@@ -1857,8 +1976,12 @@ export class ControllerBase {
         assign(this, values);
         return this;
     }
-    get $() { return getFields(this, this.remult); }
-    get _() { return getControllerRef(this, this.remult); }
+    get $() {
+        return getFields(this, this.remult);
+    }
+    get _() {
+        return getControllerRef(this, this.remult);
+    }
 }
 class QueryResultImpl {
     constructor(options, repo) {
@@ -1879,7 +2002,7 @@ class QueryResultImpl {
             orderBy: this.options.orderBy,
             limit: this.options.pageSize,
             page: page,
-            load: this.options.load
+            load: this.options.load,
         });
     }
     async count() {
@@ -1898,10 +2021,12 @@ class QueryResultImpl {
     async paginator(pNextPageFilter) {
         this.options.orderBy = Sort.createUniqueEntityOrderBy(this.repo.metadata, this.options.orderBy);
         let items = await 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,
         });
         let nextPage = undefined;
         let hasNextPage = items.length == this.options.pageSize;
@@ -1913,7 +2038,7 @@ class QueryResultImpl {
             count: () => this.count(),
             hasNextPage,
             items,
-            nextPage
+            nextPage,
         };
     }
     [Symbol.asyncIterator]() {
@@ -1928,7 +2053,7 @@ class QueryResultImpl {
         let j = 0;
         itStrategy = async () => {
             if (this.options.progress) {
-                this.options.progress.progress(j++ / await this.count());
+                this.options.progress.progress(j++ / (await this.count()));
             }
             if (currentPage === undefined || itemIndex == currentPage.items.length) {
                 if (currentPage && !currentPage.hasNextPage)
@@ -1944,8 +2069,9 @@ class QueryResultImpl {
                 }
                 else {
                     if (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');
                     }
                 }
             }
@@ -1956,7 +2082,7 @@ class QueryResultImpl {
             next: async () => {
                 let r = itStrategy();
                 return r;
-            }
+            },
         };
     }
 }
@@ -1968,18 +2094,18 @@ class cacheEntityInfo {
 class SubscribableImp {
     reportChanged() {
         if (this._subscribers)
-            this._subscribers.forEach(x => x.reportChanged());
+            this._subscribers.forEach((x) => x.reportChanged());
     }
     reportObserved() {
         if (this._subscribers)
-            this._subscribers.forEach(x => x.reportObserved());
+            this._subscribers.forEach((x) => x.reportObserved());
     }
     subscribe(listener) {
         let list;
-        if (typeof listener === "function")
+        if (typeof listener === 'function')
             list = {
                 reportChanged: () => listener(),
-                reportObserved: () => { }
+                reportObserved: () => { },
             };
         else
             list = listener;
@@ -1987,7 +2113,7 @@ class SubscribableImp {
             this._subscribers = [];
         }
         this._subscribers.push(list);
-        return () => this._subscribers = this._subscribers.filter(x => x != list);
+        return () => (this._subscribers = this._subscribers.filter((x) => x != list));
     }
 }
 export function getEntityMetadata(entity) {
@@ -1995,14 +2121,18 @@ export function getEntityMetadata(entity) {
         return entity.metadata;
     const settings = getEntitySettings(entity, false);
     if (settings) {
-        return RemultProxy.defaultRemult.repo(entity).metadata;
+        return defaultRemult.repo(entity).metadata;
     }
     return entity;
 }
 export function getRepository(entity) {
     const settings = getEntitySettings(entity, false);
     if (settings) {
-        return RemultProxy.defaultRemult.repo(entity);
+        return defaultRemult.repo(entity);
     }
     return entity;
 }
+export function checkTarget(target) {
+    if (!target)
+        throw new Error("Set the 'experimentalDecorators:true' option in your 'tsconfig' or 'jsconfig' (target undefined)");
+}