remult 0.12.8 → 0.13.2

package/src/remult3/RepositoryImplementation.d.ts

@@ -1,7 +1,7 @@
-import { FieldMetadata, FieldOptions, ValueListItem } from "../column-interfaces";
+import { FieldMetadata, FieldOptions, ValueConverter, ValueListItem } from "../column-interfaces";
 import { EntityOptions } from "../entity";
 import { LookupColumn } from '../column';
-import { EntityMetadata, FieldRef, Fields, EntityFilter, FindOptions, Repository, EntityRef, QueryOptions, QueryResult, EntityOrderBy, FieldsMetadata, IdMetadata, FindFirstOptionsBase, FindFirstOptions, OmitEB, Subscribable, ControllerRef } from "./remult3";
+import { EntityMetadata, FieldRef, FieldsRef, EntityFilter, FindOptions, Repository, EntityRef, QueryOptions, QueryResult, EntityOrderBy, FieldsMetadata, IdMetadata, FindFirstOptionsBase, FindFirstOptions, OmitEB, Subscribable, ControllerRef } from "./remult3";
 import { ClassType } from "../../classType";
 import { Remult, Unobserve } from "../context";
 import { entityEventListener } from "../__EntityValueProvider";
@@ -78,7 +78,7 @@ declare abstract class rowHelperBase<T> {
         [key: string]: string;
     };
     protected __assertValidity(): void;
-    abstract get fields(): Fields<T>;
+    abstract get fields(): FieldsRef<T>;
     catchSaveErrors(err: any): any;
     __clearErrorsAndReportChanged(): void;
     _reportChangedToEntityAndFields(): void;
@@ -108,7 +108,7 @@ export declare class rowHelperImplementation<T> extends rowHelperBase<T> impleme
     undoChanges(): void;
     reload(): Promise<T>;
     private _columns;
-    get fields(): Fields<T>;
+    get fields(): FieldsRef<T>;
     private _saving;
     save(): Promise<T>;
     private getIdFilter;
@@ -121,7 +121,7 @@ export declare class rowHelperImplementation<T> extends rowHelperBase<T> impleme
     wasChanged(): boolean;
     __performColumnAndEntityValidations(): Promise<void>;
 }
-export declare function getFields<fieldsContainerType>(container: fieldsContainerType, remult?: Remult): Fields<fieldsContainerType>;
+export declare function getFields<fieldsContainerType>(container: fieldsContainerType, remult?: Remult): FieldsRef<fieldsContainerType>;
 export declare function getControllerRef<fieldsContainerType>(container: fieldsContainerType, remult?: Remult): ControllerRef<fieldsContainerType>;
 export declare class controllerRefImpl<T = any> extends rowHelperBase<T> implements ControllerRef<T> {
     constructor(columnsInfo: FieldOptions[], instance: any, remult: Remult);
@@ -130,7 +130,7 @@ export declare class controllerRefImpl<T = any> extends rowHelperBase<T> impleme
         [key: string]: string;
     };
     originalValues: any;
-    fields: Fields<T>;
+    fields: FieldsRef<T>;
 }
 export declare class FieldRefImplementation<entityType, valueType> implements FieldRef<entityType, valueType> {
     private settings;
@@ -176,7 +176,7 @@ export declare class columnDefsImpl implements FieldMetadata {
     options: FieldOptions<any, any>;
     target: ClassType<any>;
     readonly: boolean;
-    valueConverter: import("../column-interfaces").ValueConverter<any>;
+    valueConverter: ValueConverter<any>;
     allowNull: boolean;
     caption: string;
     get dbName(): any;
@@ -201,18 +201,55 @@ declare class EntityFullInfo<T> implements EntityMetadata<T> {
     dbNamePromise: Promise<string>;
     getDbName(): Promise<string>;
     idMetadata: IdMetadata<T>;
-    dbAutoIncrementId: boolean;
     fields: FieldsMetadata<T>;
     dbName: string;
     caption: string;
 }
 export declare function FieldType<valueType = any>(...options: (FieldOptions<any, valueType> | ((options: FieldOptions<any, valueType>, remult: Remult) => void))[]): (target: any) => any;
-export declare function JsonField<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
-export declare function DateOnlyField<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
-export declare function IntegerField<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
-export declare function ValueListFieldType<entityType = any, valueType extends ValueListItem = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (type: ClassType<valueType>) => any;
-export declare function UuidField<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
-export declare function Field<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+export declare const Fields1: {
+    String: () => (a: any) => void;
+};
+export declare class Fields {
+    static Object<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static DateOnly<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static Date<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static Integer<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static AutoIncrement<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static Number<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static Uuid<entityType = any>(...options: (FieldOptions<entityType, string> | ((options: FieldOptions<entityType, string>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static String<entityType = any>(...options: (StringFieldOptions<entityType> | ((options: StringFieldOptions<entityType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static Boolean<entityType = any>(...options: (FieldOptions<entityType, boolean> | ((options: FieldOptions<entityType, boolean>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+}
+export declare function isAutoIncrement(f: FieldMetadata): boolean;
+export interface StringFieldOptions<entityType = any> extends FieldOptions<entityType, string> {
+    maxLength?: number;
+}
+export declare function ValueListFieldType<entityType = any, valueType extends ValueListItem = any>(...options: (ValueListFieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (type: ClassType<valueType>) => any;
+export interface ValueListFieldOptions<entityType, valueType> extends FieldOptions<entityType, valueType> {
+    getValues?: () => valueType[];
+}
+export declare class ValueListInfo<T extends ValueListItem> implements ValueConverter<T> {
+    private valueListType;
+    static get<T extends ValueListItem>(type: ClassType<T>): ValueListInfo<T>;
+    private byIdMap;
+    private values;
+    isNumeric: boolean;
+    private constructor();
+    getValues(): T[];
+    byId(key: any): T;
+    fromJson(val: any): T;
+    toJson(val: T): any;
+    fromDb(val: any): T;
+    toDb(val: T): any;
+    toInput(val: T, inputType: string): string;
+    fromInput(val: string, inputType: string): T;
+    displayValue?(val: T): string;
+    fieldTypeInDb?: string;
+    inputType?: string;
+}
+export declare function getValueList<T>(type: ClassType<T>): T[];
+export declare function Field<entityType = any, valueType = any>(valueType: () => ClassType<valueType>, ...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+export declare const storableMember: unique symbol;
 export declare function decorateColumnSettings<valueType>(settings: FieldOptions<any, valueType>, remult: Remult): FieldOptions<any, valueType>;
 interface columnInfo {
     key: string;
@@ -229,12 +266,12 @@ export declare class EntityBase {
     assign(values: Partial<Omit<this, keyof EntityBase>>): this;
     delete(): Promise<void>;
     isNew(): boolean;
-    get $(): Fields<this>;
+    get $(): FieldsRef<this>;
 }
 export declare class ControllerBase {
     protected remult: Remult;
     constructor(remult: Remult);
-    get $(): Fields<this>;
+    get $(): FieldsRef<this>;
     get _(): ControllerRef<this>;
 }
 declare class SubscribableImp implements Subscribable {

package/src/remult3/RepositoryImplementation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControllerBase = exports.EntityBase = exports.Entity = exports.BuildEntity = exports.decorateColumnSettings = exports.Field = exports.UuidField = exports.ValueListFieldType = exports.IntegerField = exports.DateOnlyField = exports.JsonField = 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.ControllerBase = exports.EntityBase = exports.Entity = exports.BuildEntity = exports.decorateColumnSettings = exports.storableMember = exports.Field = exports.getValueList = exports.ValueListInfo = exports.ValueListFieldType = exports.isAutoIncrement = exports.Fields = exports.Fields1 = 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");
@@ -616,6 +616,7 @@ function getEntityKey(entity) {
 exports.getEntityKey = getEntityKey;
 exports.columnsOfType = new Map();
 function createOldEntity(entity, remult) {
+    var _this = this;
     var r = exports.columnsOfType.get(entity);
     if (!r)
         exports.columnsOfType.set(entity, r = []);
@@ -634,12 +635,21 @@ function createOldEntity(entity, remult) {
             info = tslib_1.__assign(tslib_1.__assign({}, baseSettings_1), info);
             var functions = ["saving", "saved", "deleting", "deleted", "validation"];
             var _loop_2 = function (key_1) {
-                if (baseSettings_1[key_1]) {
+                if (baseSettings_1[key_1] && baseSettings_1[key_1] !== info[key_1]) {
                     var x_1 = info[key_1];
-                    info[key_1] = function (a, b) {
-                        x_1(a, b);
-                        baseSettings_1[key_1](a, b);
-                    };
+                    info[key_1] = function (a, b) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                        return tslib_1.__generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, x_1(a, b)];
+                                case 1:
+                                    _a.sent();
+                                    return [4 /*yield*/, baseSettings_1[key_1](a, b)];
+                                case 2:
+                                    _a.sent();
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); };
                 }
             };
             try {
@@ -1238,7 +1248,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         try {
                             for (_d = tslib_1.__values(this.metadata.fields), _e = _d.next(); !_e.done; _e = _d.next()) {
                                 field = _e.value;
-                                if (field.dbReadOnly || field == this.metadata.idMetadata.field && this.metadata.options.dbAutoIncrementId) {
+                                if (field.dbReadOnly) {
                                     d[field.key] = undefined;
                                     ignoreKeys.push(field.key);
                                     f = this.fields.find(field);
@@ -2075,7 +2085,6 @@ var EntityFullInfo = /** @class */ (function () {
             finally { if (e_29) throw e_29.error; }
         }
         this.fields = r;
-        this.dbAutoIncrementId = entityInfo.dbAutoIncrementId;
         this.caption = buildCaption(entityInfo.caption, this.key, remult);
         if (entityInfo.id) {
             this.idMetadata.field = entityInfo.id(this.fields);
@@ -2142,46 +2151,102 @@ function FieldType() {
             options = [];
         }
         options.splice(0, 0, { valueType: target });
-        Reflect.defineMetadata(storableMember, options, target);
+        Reflect.defineMetadata(exports.storableMember, options, target);
         return target;
     };
 }
 exports.FieldType = FieldType;
-function JsonField() {
-    var options = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        options[_i] = arguments[_i];
-    }
-    return Field.apply(void 0, tslib_1.__spread([{
-            valueConverter: {
-                toDb: function (x) { return x; },
-                fromDb: function (x) { return x; },
-                fieldTypeInDb: 'json'
-            }
-        }], options));
-}
-exports.JsonField = JsonField;
-function DateOnlyField() {
-    var options = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        options[_i] = arguments[_i];
+exports.Fields1 = {
+    String: function () {
+        return function (a) {
+        };
     }
-    return Field.apply(void 0, tslib_1.__spread([{
-            valueConverter: valueConverters_1.DateOnlyValueConverter
-        }], options));
-}
-exports.DateOnlyField = DateOnlyField;
-function IntegerField() {
-    var options = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        options[_i] = arguments[_i];
+};
+var Fields = /** @class */ (function () {
+    function Fields() {
     }
-    return Field.apply(void 0, tslib_1.__spread([{
-            valueType: Number,
-            valueConverter: valueConverters_1.IntegerValueConverter
-        }], options));
+    Fields.Object = function () {
+        var options = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            options[_i] = arguments[_i];
+        }
+        return Field.apply(void 0, tslib_1.__spread([undefined], options));
+    };
+    Fields.DateOnly = function () {
+        var options = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            options[_i] = arguments[_i];
+        }
+        return Field.apply(void 0, tslib_1.__spread([function () { return Date; }, {
+                valueConverter: valueConverters_1.ValueConverters.DateOnly
+            }], options));
+    };
+    Fields.Date = function () {
+        var options = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            options[_i] = arguments[_i];
+        }
+        return Field.apply(void 0, tslib_1.__spread([function () { return Date; }], options));
+    };
+    Fields.Integer = function () {
+        var options = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            options[_i] = arguments[_i];
+        }
+        return Field.apply(void 0, tslib_1.__spread([function () { return Number; }, {
+                valueConverter: valueConverters_1.ValueConverters.Integer
+            }], options));
+    };
+    Fields.AutoIncrement = function () {
+        var options = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            options[_i] = arguments[_i];
+        }
+        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' })
+            }], options));
+    };
+    Fields.Number = function () {
+        var options = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            options[_i] = arguments[_i];
+        }
+        return Field.apply(void 0, tslib_1.__spread([function () { return Number; }], options));
+    };
+    Fields.Uuid = function () {
+        var options = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            options[_i] = arguments[_i];
+        }
+        return Field.apply(void 0, tslib_1.__spread([function () { return String; }, {
+                allowApiUpdate: false,
+                defaultValue: function () { return uuid_1.v4(); }
+            }], options));
+    };
+    Fields.String = function () {
+        var options = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            options[_i] = arguments[_i];
+        }
+        return Field.apply(void 0, tslib_1.__spread([function () { return String; }], options));
+    };
+    Fields.Boolean = function () {
+        var options = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            options[_i] = arguments[_i];
+        }
+        return Field.apply(void 0, tslib_1.__spread([function () { return Boolean; }], options));
+    };
+    return Fields;
+}());
+exports.Fields = Fields;
+function isAutoIncrement(f) {
+    var _a;
+    return ((_a = f.options.valueConverter) === null || _a === void 0 ? void 0 : _a.fieldTypeInDb) === 'autoincrement';
 }
-exports.IntegerField = IntegerField;
+exports.isAutoIncrement = isAutoIncrement;
 function ValueListFieldType() {
     var options = [];
     for (var _i = 0; _i < arguments.length; _i++) {
@@ -2189,31 +2254,111 @@ function ValueListFieldType() {
     }
     return function (type) {
         return FieldType.apply(void 0, tslib_1.__spread([function (o) {
-                o.valueConverter = new valueConverters_1.ValueListValueConverter(type),
+                o.valueConverter = ValueListInfo.get(type),
                     o.displayValue = function (item, val) { return val.caption; };
             }], options))(type);
     };
 }
 exports.ValueListFieldType = ValueListFieldType;
-function UuidField() {
-    var options = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        options[_i] = arguments[_i];
+var ValueListInfo = /** @class */ (function () {
+    function ValueListInfo(valueListType) {
+        var e_30, _a;
+        this.valueListType = valueListType;
+        this.byIdMap = new Map();
+        this.values = [];
+        this.isNumeric = false;
+        for (var member in this.valueListType) {
+            var s = this.valueListType[member];
+            if (s instanceof this.valueListType) {
+                if (s.id === undefined)
+                    s.id = member;
+                if (s.caption === undefined)
+                    s.caption = column_1.makeTitle(member);
+                if (typeof s.id === 'number')
+                    this.isNumeric = true;
+                this.byIdMap.set(s.id, s);
+                this.values.push(s);
+            }
+        }
+        if (this.isNumeric) {
+            this.fieldTypeInDb = 'integer';
+        }
+        var options = Reflect.getMetadata(exports.storableMember, valueListType);
+        if (options)
+            try {
+                for (var options_1 = tslib_1.__values(options), options_1_1 = options_1.next(); !options_1_1.done; options_1_1 = options_1.next()) {
+                    var op = options_1_1.value;
+                    if (op === null || op === void 0 ? void 0 : op.getValues)
+                        this.values = op.getValues();
+                }
+            }
+            catch (e_30_1) { e_30 = { error: e_30_1 }; }
+            finally {
+                try {
+                    if (options_1_1 && !options_1_1.done && (_a = options_1.return)) _a.call(options_1);
+                }
+                finally { if (e_30) throw e_30.error; }
+            }
     }
-    return Field.apply(void 0, tslib_1.__spread([{
-            allowApiUpdate: false,
-            defaultValue: function () { return uuid_1.v4(); }
-        }], options));
+    ValueListInfo.get = function (type) {
+        var r = typeCache.get(type);
+        if (!r)
+            r = new ValueListInfo(type);
+        typeCache.set(type, r);
+        return r;
+    };
+    ValueListInfo.prototype.getValues = function () {
+        return this.values;
+    };
+    ValueListInfo.prototype.byId = function (key) {
+        if (this.isNumeric)
+            key = +key;
+        return this.byIdMap.get(key);
+    };
+    ValueListInfo.prototype.fromJson = function (val) {
+        return this.byId(val);
+    };
+    ValueListInfo.prototype.toJson = function (val) {
+        if (!val)
+            return undefined;
+        return val.id;
+    };
+    ValueListInfo.prototype.fromDb = function (val) {
+        return this.fromJson(val);
+    };
+    ValueListInfo.prototype.toDb = function (val) {
+        return this.toJson(val);
+    };
+    ValueListInfo.prototype.toInput = function (val, inputType) {
+        return this.toJson(val);
+    };
+    ValueListInfo.prototype.fromInput = function (val, inputType) {
+        return this.fromJson(val);
+    };
+    ValueListInfo.prototype.displayValue = function (val) {
+        if (!val)
+            return '';
+        return val.caption;
+    };
+    return ValueListInfo;
+}());
+exports.ValueListInfo = ValueListInfo;
+var typeCache = new Map();
+function getValueList(type) {
+    return ValueListInfo.get(type).getValues();
 }
-exports.UuidField = UuidField;
-function Field() {
+exports.getValueList = getValueList;
+function Field(valueType) {
     var options = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        options[_i] = arguments[_i];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        options[_i - 1] = arguments[_i];
     }
     return function (target, key, c) {
         var factory = function (remult) {
             var r = buildOptions(options, remult);
+            if (!r.valueType && valueType) {
+                r.valueType = valueType();
+            }
             if (!r.key) {
                 r.key = key;
             }
@@ -2250,13 +2395,13 @@ function Field() {
     };
 }
 exports.Field = Field;
-var storableMember = Symbol("storableMember");
+exports.storableMember = Symbol("storableMember");
 function buildOptions(options, remult) {
-    var e_30, _a;
+    var e_31, _a;
     var r = {};
     try {
-        for (var options_1 = tslib_1.__values(options), options_1_1 = options_1.next(); !options_1_1.done; options_1_1 = options_1.next()) {
-            var o = options_1_1.value;
+        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")
                     o(r, remult);
@@ -2265,18 +2410,18 @@ function buildOptions(options, remult) {
             }
         }
     }
-    catch (e_30_1) { e_30 = { error: e_30_1 }; }
+    catch (e_31_1) { e_31 = { error: e_31_1 }; }
     finally {
         try {
-            if (options_1_1 && !options_1_1.done && (_a = options_1.return)) _a.call(options_1);
+            if (options_2_1 && !options_2_1.done && (_a = options_2.return)) _a.call(options_2);
         }
-        finally { if (e_30) throw e_30.error; }
+        finally { if (e_31) throw e_31.error; }
     }
     return r;
 }
 function decorateColumnSettings(settings, remult) {
     if (settings.valueType) {
-        var settingsOnTypeLevel = Reflect.getMetadata(storableMember, settings.valueType);
+        var settingsOnTypeLevel = Reflect.getMetadata(exports.storableMember, settings.valueType);
         if (settingsOnTypeLevel) {
             settings = tslib_1.__assign(tslib_1.__assign({}, buildOptions(settingsOnTypeLevel, remult)), settings);
         }
@@ -2292,18 +2437,18 @@ function decorateColumnSettings(settings, remult) {
     if (settings.valueType == Number) {
         var x = settings;
         if (!settings.valueConverter)
-            x.valueConverter = valueConverters_1.NumberValueConverter;
+            x.valueConverter = valueConverters_1.ValueConverters.Number;
     }
     if (settings.valueType == Date) {
         var x = settings;
         if (!settings.valueConverter) {
-            x.valueConverter = valueConverters_1.DateValueConverter;
+            x.valueConverter = valueConverters_1.ValueConverters.Date;
         }
     }
     if (settings.valueType == Boolean) {
         var x = settings;
         if (!x.valueConverter)
-            x.valueConverter = valueConverters_1.BoolValueConverter;
+            x.valueConverter = valueConverters_1.ValueConverters.Boolean;
     }
     if (!settings.valueConverter) {
         var ei = getEntitySettings(settings.valueType, false);
@@ -2314,7 +2459,7 @@ function decorateColumnSettings(settings, remult) {
             };
         }
         else
-            settings.valueConverter = valueConverters_1.DefaultValueConverter;
+            settings.valueConverter = valueConverters_1.ValueConverters.Default;
     }
     if (!settings.valueConverter.toJson) {
         settings.valueConverter.toJson = function (x) { return x; };
@@ -2362,16 +2507,17 @@ function Entity(key) {
             if (Object.prototype.hasOwnProperty.call(target, customFilterMember)) {
                 var element = target[customFilterMember];
                 if ((_a = element === null || element === void 0 ? void 0 : element.customFilterInfo) === null || _a === void 0 ? void 0 : _a.customFilterTranslator) {
-                    element.customFilterInfo.key = customFilterMember;
+                    if (!element.customFilterInfo.key)
+                        element.customFilterInfo.key = customFilterMember;
                 }
             }
         }
         var factory = function (remult) {
-            var e_31, _a;
+            var e_32, _a;
             var r = {};
             try {
-                for (var options_2 = tslib_1.__values(options), options_2_1 = options_2.next(); !options_2_1.done; options_2_1 = options_2.next()) {
-                    var o = options_2_1.value;
+                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")
                             o(r, remult);
@@ -2380,12 +2526,12 @@ function Entity(key) {
                     }
                 }
             }
-            catch (e_31_1) { e_31 = { error: e_31_1 }; }
+            catch (e_32_1) { e_32 = { error: e_32_1 }; }
             finally {
                 try {
-                    if (options_2_1 && !options_2_1.done && (_a = options_2.return)) _a.call(options_2);
+                    if (options_3_1 && !options_3_1.done && (_a = options_3.return)) _a.call(options_3);
                 }
-                finally { if (e_31) throw e_31.error; }
+                finally { if (e_32) throw e_32.error; }
             }
             var base = Object.getPrototypeOf(target);
             if (base) {
@@ -2491,9 +2637,9 @@ var QueryResultImpl = /** @class */ (function () {
         });
     };
     QueryResultImpl.prototype.forEach = function (what) {
-        var e_32, _a;
+        var e_33, _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var i, _b, _c, x, e_32_1;
+            var i, _b, _c, x, e_33_1;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -2515,8 +2661,8 @@ var QueryResultImpl = /** @class */ (function () {
                     case 5: return [3 /*break*/, 2];
                     case 6: return [3 /*break*/, 13];
                     case 7:
-                        e_32_1 = _d.sent();
-                        e_32 = { error: e_32_1 };
+                        e_33_1 = _d.sent();
+                        e_33 = { error: e_33_1 };
                         return [3 /*break*/, 13];
                     case 8:
                         _d.trys.push([8, , 11, 12]);
@@ -2527,7 +2673,7 @@ var QueryResultImpl = /** @class */ (function () {
                         _d.label = 10;
                     case 10: return [3 /*break*/, 12];
                     case 11:
-                        if (e_32) throw e_32.error;
+                        if (e_33) throw e_33.error;
                         return [7 /*endfinally*/];
                     case 12: return [7 /*endfinally*/];
                     case 13: return [2 /*return*/, i];

package/src/remult3/remult3.d.ts

@@ -13,7 +13,7 @@ export interface EntityRef<entityType> extends Subscribable {
     isNew(): boolean;
     wasChanged(): boolean;
     wasDeleted(): boolean;
-    fields: Fields<entityType>;
+    fields: FieldsRef<entityType>;
     error: string;
     getId(): any;
     repository: Repository<entityType>;
@@ -27,7 +27,7 @@ export interface EntityRef<entityType> extends Subscribable {
 }
 export interface ControllerRef<entityType> extends Subscribable {
     hasErrors(): boolean;
-    fields: Fields<entityType>;
+    fields: FieldsRef<entityType>;
     error: string;
     validate(): Promise<boolean>;
     readonly isLoading: boolean;
@@ -40,7 +40,7 @@ export declare type RefSubscriber = (() => void) | RefSubscriberBase;
 export interface Subscribable {
     subscribe(listener: RefSubscriber): Unobserve;
 }
-export declare type Fields<entityType> = {
+export declare type FieldsRef<entityType> = {
     [Properties in keyof OmitEB<entityType>]: entityType[Properties] extends {
         id: (number | string);
     } ? IdFieldRef<entityType, entityType[Properties]> : FieldRef<entityType, entityType[Properties]>;
@@ -50,7 +50,7 @@ export declare type Fields<entityType> = {
     toArray(): FieldRef<entityType, any>[];
 };
 export declare type FieldsMetadata<entityType> = {
-    [Properties in keyof OmitEB<entityType>]: FieldMetadata;
+    [Properties in keyof OmitEB<entityType>]: FieldMetadata<entityType[Properties]>;
 } & {
     find(fieldMetadataOrKey: FieldMetadata | string): FieldMetadata;
     [Symbol.iterator]: () => IterableIterator<FieldMetadata>;