remult 0.13.4 → 0.13.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.13.4",
+    "version": "0.13.7",
     "description": "remult core lib",
     "homepage": "https://remult.dev/",
     "repository": {

package/readme.md

@@ -54,17 +54,17 @@ app.listen(port, () => {
 
 ## Define model classes
 ```ts
-import { Entity, EntityBase, Field } from 'remult';
+import { Entity, EntityBase, Fields } from 'remult';
 
 @Entity('products', {
     allowApiCrud: true
 })
 export class Product extends EntityBase {
-  @Field()
-  name: string = '';
+  @Fields.string()
+  name = '';
 
-  @Field()
-  unitPrice: number = 0;
+  @Fields.number()
+  unitPrice = 0;
 }
 ```
 
@@ -106,17 +106,17 @@ import { Min } from 'class-validator';
     allowApiCrud: true
 })
 export class Product extends EntityBase {
-    @Field<Product>({
+    @Fields.string<Product>({
         validate: p => {
             if (p.name.trim().length == 0)
                 p.$.name.error = 'required';
         }
     })
-    name: string = '';
+    name = '';
 
-    @Field()
+    @Fields.number()
     @Min(0)
-    unitPrice: number = 0;
+    unitPrice = 0;
 }
 ```
 
@@ -147,13 +147,13 @@ catch {
     allowApiUpdate: (remult, article) => article.author.id == remult.user.id
 })
 export class Article extends EntityBase {
-    @Field({ allowApiUpdate: false })
-    slug: string;
+    @Fields.string({ allowApiUpdate: false })
+    slug = '';
     
-    @Field({ allowApiUpdate: false })
-    author: Profile;
+    @Field(() => Profile, { allowApiUpdate: false })
+    author!: Profile;
 
-    @Field()
-    content: string;
+    @Fields.string()
+    content = '';
 }
 ```

package/remult-knex/index.js

@@ -375,7 +375,7 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
     FilterConsumerBridgeToKnexRequest.prototype.or = function (orElements) {
         var _this = this;
         this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var result, _loop_1, this_1, orElements_1, orElements_1_1, element, e_5_1;
+            var result, _loop_1, this_1, orElements_1, orElements_1_1, element, state_1, e_5_1;
             var e_5, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
@@ -399,6 +399,8 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                                                 });
                                             });
                                         }
+                                        else
+                                            return [2 /*return*/, { value: void 0 }]; //empty or means all rows
                                         return [2 /*return*/];
                                 }
                             });
@@ -414,7 +416,9 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                         element = orElements_1_1.value;
                         return [5 /*yield**/, _loop_1(element)];
                     case 3:
-                        _b.sent();
+                        state_1 = _b.sent();
+                        if (typeof state_1 === "object")
+                            return [2 /*return*/, state_1.value];
                         _b.label = 4;
                     case 4:
                         orElements_1_1 = orElements_1.next();

package/remult-mongo.js

@@ -339,15 +339,16 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
         this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             var result, orElements_1, orElements_1_1, element, f, where, e_7_1;
             var e_7, _a;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
+            var _b;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         result = [];
-                        _b.label = 1;
+                        _c.label = 1;
                     case 1:
-                        _b.trys.push([1, 6, 7, 8]);
+                        _c.trys.push([1, 6, 7, 8]);
                         orElements_1 = tslib_1.__values(orElements), orElements_1_1 = orElements_1.next();
-                        _b.label = 2;
+                        _c.label = 2;
                     case 2:
                         if (!!orElements_1_1.done) return [3 /*break*/, 5];
                         element = orElements_1_1.value;
@@ -356,17 +357,19 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
                         element.__applyToConsumer(f);
                         return [4 /*yield*/, f.resolveWhere()];
                     case 3:
-                        where = _b.sent();
-                        if ((where === null || where === void 0 ? void 0 : where.$and.length) > 0) {
+                        where = _c.sent();
+                        if (((_b = where === null || where === void 0 ? void 0 : where.$and) === null || _b === void 0 ? void 0 : _b.length) > 0) {
                             result.push(where);
                         }
-                        _b.label = 4;
+                        else
+                            return [2 /*return*/]; //since empty or is all rows;
+                        _c.label = 4;
                     case 4:
                         orElements_1_1 = orElements_1.next();
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_7_1 = _b.sent();
+                        e_7_1 = _c.sent();
                         e_7 = { error: e_7_1 };
                         return [3 /*break*/, 8];
                     case 7:

package/server/expressBridge.js

@@ -806,35 +806,35 @@ var JobsInQueueEntity = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     tslib_1.__decorate([
-        remult3_1.Fields.String(),
+        remult3_1.Fields.string(),
         tslib_1.__metadata("design:type", String)
     ], JobsInQueueEntity.prototype, "userId", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.String(),
+        remult3_1.Fields.string(),
         tslib_1.__metadata("design:type", String)
     ], JobsInQueueEntity.prototype, "url", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.Date(),
+        remult3_1.Fields.date(),
         tslib_1.__metadata("design:type", Date)
     ], JobsInQueueEntity.prototype, "submitTime", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.Date(),
+        remult3_1.Fields.date(),
         tslib_1.__metadata("design:type", Date)
     ], JobsInQueueEntity.prototype, "doneTime", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.String(),
+        remult3_1.Fields.string(),
         tslib_1.__metadata("design:type", String)
     ], JobsInQueueEntity.prototype, "result", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.Boolean(),
+        remult3_1.Fields.boolean(),
         tslib_1.__metadata("design:type", Boolean)
     ], JobsInQueueEntity.prototype, "done", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.Boolean(),
+        remult3_1.Fields.boolean(),
         tslib_1.__metadata("design:type", Boolean)
     ], JobsInQueueEntity.prototype, "error", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.Number(),
+        remult3_1.Fields.number(),
         tslib_1.__metadata("design:type", Number)
     ], JobsInQueueEntity.prototype, "progress", void 0);
     JobsInQueueEntity = tslib_1.__decorate([

package/src/backend-tests/my-test.backend-spec.js

@@ -2,28 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var __1 = require("../..");
-var context_1 = require("../context");
 var remult_knex_1 = require("../../remult-knex");
-var Knex = require("knex");
 var dotenv_1 = require("dotenv");
 var backend_database_test_setup_backend_spec_1 = require("./backend-database-test-setup.backend-spec");
 var entityWithValidations_1 = require("../shared-tests/entityWithValidations");
 dotenv_1.config();
-describe("test", function () {
-    var remult;
-    var knex;
-    beforeAll(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-        return tslib_1.__generator(this, function (_a) {
-            knex =
-                Knex.default({
-                    client: 'pg',
-                    connection: process.env.DATABASE_URL
-                });
-            remult = new context_1.Remult(new remult_knex_1.KnexDataProvider(knex));
-            return [2 /*return*/];
-        });
-    }); });
-});
 backend_database_test_setup_backend_spec_1.testPostgresImplementation("sql filter", function (_a) {
     var createEntity = _a.createEntity;
     return tslib_1.__awaiter(void 0, void 0, void 0, function () {

package/src/context.d.ts

@@ -1,5 +1,5 @@
 import { DataProvider } from "./data-interfaces";
-import { EntityRef, Repository } from "./remult3";
+import { EntityMetadata, EntityRef, FindOptions, Repository } from "./remult3";
 import { ClassType } from "../classType";
 export interface HttpProvider {
     post(url: string, data: any): Promise<any> | {
@@ -21,6 +21,7 @@ export declare function toPromise<T>(p: Promise<T> | {
 export declare function processHttpException(ex: any): Promise<any>;
 export declare function isBackend(): boolean;
 export declare class Remult {
+    static onFind: (metadata: EntityMetadata, options: FindOptions<any>) => void;
     clearAllCache(): any;
     static entityRefInit?: (ref: EntityRef<any>, row: any) => void;
     authenticated(): boolean;

package/src/context.js

@@ -283,6 +283,7 @@ var Remult = /** @class */ (function () {
         }
         return r;
     };
+    Remult.onFind = function (metadata, options) { };
     Remult.apiBaseUrl = '/api';
     return Remult;
 }());

package/src/filter/filter-consumer-bridge-to-sql-request.js

@@ -76,6 +76,8 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
                         return [4 /*yield*/, f.resolveWhere()];
                     case 2:
                         where = _b.sent();
+                        if (!where)
+                            return [2 /*return*/]; //since if any member of or is empty, then the entire or is irrelevant
                         if (where.length > 0) {
                             if (statement.length > 0) {
                                 statement += " or ";

package/src/id-entity.js

@@ -9,7 +9,7 @@ var IdEntity = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     tslib_1.__decorate([
-        remult3_1.Fields.Uuid(),
+        remult3_1.Fields.uuid(),
         tslib_1.__metadata("design:type", String)
     ], IdEntity.prototype, "id", void 0);
     return IdEntity;

package/src/remult3/RepositoryImplementation.d.ts

@@ -210,21 +210,21 @@ 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;
+    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 declare function ValueListFieldType<entityType = any, valueType extends ValueListItem = any>(...options: (ValueListFieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (type: ClassType<valueType>) => void;
 export interface ValueListFieldOptions<entityType, valueType> extends FieldOptions<entityType, valueType> {
     getValues?: () => valueType[];
 }
@@ -235,6 +235,8 @@ export declare class ValueListInfo<T extends ValueListItem> implements ValueConv
     private values;
     isNumeric: boolean;
     private constructor();
+    private loadedFromOptions;
+    loadFromDecoratorOptions(): void;
     getValues(): T[];
     byId(key: any): T;
     fromJson(val: any): T;

package/src/remult3/RepositoryImplementation.js

@@ -274,12 +274,41 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     RepositoryImplementation.prototype.find = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var opt, _a, rawRows, loadFields, _b, _c, col, ei, load, repo, toLoad, rawRows_1, rawRows_1_1, r, val, rows, rows_1, rows_1_1, r, e_4_1, result;
-            var e_4, _d, e_5, _e, _f, e_6, _g;
+            function loadManyToOne(repo, toLoad) {
+                return tslib_1.__awaiter(this, void 0, void 0, function () {
+                    var rows, rows_1, rows_1_1, r;
+                    var _a, e_6, _b;
+                    return tslib_1.__generator(this, function (_c) {
+                        switch (_c.label) {
+                            case 0: return [4 /*yield*/, repo.find({ where: (_a = repo.metadata.idMetadata).getIdFilter.apply(_a, tslib_1.__spread(toLoad)) })];
+                            case 1:
+                                rows = _c.sent();
+                                try {
+                                    for (rows_1 = tslib_1.__values(rows), rows_1_1 = rows_1.next(); !rows_1_1.done; rows_1_1 = rows_1.next()) {
+                                        r = rows_1_1.value;
+                                        repo.addToCache(r);
+                                    }
+                                }
+                                catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                                finally {
+                                    try {
+                                        if (rows_1_1 && !rows_1_1.done && (_b = rows_1.return)) _b.call(rows_1);
+                                    }
+                                    finally { if (e_6) throw e_6.error; }
+                                }
+                                return [2 /*return*/];
+                        }
+                    });
+                });
+            }
+            var opt, _a, rawRows, loadFields, _b, _c, col, ei, load, repo, toLoad, rawRows_1, rawRows_1_1, r, val, e_4_1, result;
+            var e_4, _d, e_5, _e;
             var _this = this;
-            return tslib_1.__generator(this, function (_h) {
-                switch (_h.label) {
+            return tslib_1.__generator(this, function (_f) {
+                switch (_f.label) {
                     case 0:
+                        context_1.Remult.onFind(this._info, options);
+                        ;
                         opt = {};
                         if (!options)
                             options = {};
@@ -290,21 +319,21 @@ var RepositoryImplementation = /** @class */ (function () {
                         _a = opt;
                         return [4 /*yield*/, this.translateWhereToFilter(options.where)];
                     case 1:
-                        _a.where = _h.sent();
+                        _a.where = _f.sent();
                         opt.orderBy = sort_1.Sort.translateOrderByToSort(this.metadata, options.orderBy);
                         opt.limit = options.limit;
                         opt.page = options.page;
                         return [4 /*yield*/, this.edp.find(opt)];
                     case 2:
-                        rawRows = _h.sent();
+                        rawRows = _f.sent();
                         loadFields = undefined;
                         if (options.load)
                             loadFields = options.load(this.metadata.fields);
-                        _h.label = 3;
+                        _f.label = 3;
                     case 3:
-                        _h.trys.push([3, 8, 9, 10]);
+                        _f.trys.push([3, 8, 9, 10]);
                         _b = tslib_1.__values(this.metadata.fields), _c = _b.next();
-                        _h.label = 4;
+                        _f.label = 4;
                     case 4:
                         if (!!_c.done) return [3 /*break*/, 7];
                         col = _c.value;
@@ -333,29 +362,16 @@ var RepositoryImplementation = /** @class */ (function () {
                             finally { if (e_5) throw e_5.error; }
                         }
                         if (!(toLoad.length > 0)) return [3 /*break*/, 6];
-                        return [4 /*yield*/, repo.find({ where: (_f = repo.metadata.idMetadata).getIdFilter.apply(_f, tslib_1.__spread(toLoad)) })];
+                        return [4 /*yield*/, loadManyToOne(repo, toLoad)];
                     case 5:
-                        rows = _h.sent();
-                        try {
-                            for (rows_1 = (e_6 = void 0, tslib_1.__values(rows)), rows_1_1 = rows_1.next(); !rows_1_1.done; rows_1_1 = rows_1.next()) {
-                                r = rows_1_1.value;
-                                repo.addToCache(r);
-                            }
-                        }
-                        catch (e_6_1) { e_6 = { error: e_6_1 }; }
-                        finally {
-                            try {
-                                if (rows_1_1 && !rows_1_1.done && (_g = rows_1.return)) _g.call(rows_1);
-                            }
-                            finally { if (e_6) throw e_6.error; }
-                        }
-                        _h.label = 6;
+                        _f.sent();
+                        _f.label = 6;
                     case 6:
                         _c = _b.next();
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_4_1 = _h.sent();
+                        e_4_1 = _f.sent();
                         e_4 = { error: e_4_1 };
                         return [3 /*break*/, 10];
                     case 9:
@@ -371,7 +387,7 @@ var RepositoryImplementation = /** @class */ (function () {
                             }
                         }); }); }))];
                     case 11:
-                        result = _h.sent();
+                        result = _f.sent();
                         return [2 /*return*/, result];
                 }
             });
@@ -2165,14 +2181,14 @@ exports.Fields1 = {
 var Fields = /** @class */ (function () {
     function Fields() {
     }
-    Fields.Object = function () {
+    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 () {
+    Fields.dateOnly = function () {
         var options = [];
         for (var _i = 0; _i < arguments.length; _i++) {
             options[_i] = arguments[_i];
@@ -2181,14 +2197,14 @@ var Fields = /** @class */ (function () {
                 valueConverter: valueConverters_1.ValueConverters.DateOnly
             }], options));
     };
-    Fields.Date = function () {
+    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 () {
+    Fields.integer = function () {
         var options = [];
         for (var _i = 0; _i < arguments.length; _i++) {
             options[_i] = arguments[_i];
@@ -2197,7 +2213,7 @@ var Fields = /** @class */ (function () {
                 valueConverter: valueConverters_1.ValueConverters.Integer
             }], options));
     };
-    Fields.AutoIncrement = function () {
+    Fields.autoIncrement = function () {
         var options = [];
         for (var _i = 0; _i < arguments.length; _i++) {
             options[_i] = arguments[_i];
@@ -2208,14 +2224,14 @@ var Fields = /** @class */ (function () {
                 valueConverter: tslib_1.__assign(tslib_1.__assign({}, valueConverters_1.ValueConverters.Integer), { fieldTypeInDb: 'autoincrement' })
             }], options));
     };
-    Fields.Number = function () {
+    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 () {
+    Fields.uuid = function () {
         var options = [];
         for (var _i = 0; _i < arguments.length; _i++) {
             options[_i] = arguments[_i];
@@ -2225,14 +2241,14 @@ var Fields = /** @class */ (function () {
                 defaultValue: function () { return uuid_1.v4(); }
             }], options));
     };
-    Fields.String = function () {
+    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 () {
+    Fields.boolean = function () {
         var options = [];
         for (var _i = 0; _i < arguments.length; _i++) {
             options[_i] = arguments[_i];
@@ -2253,29 +2269,30 @@ function ValueListFieldType() {
         options[_i] = arguments[_i];
     }
     return function (type) {
-        return FieldType.apply(void 0, tslib_1.__spread([function (o) {
+        FieldType.apply(void 0, tslib_1.__spread([function (o) {
                 o.valueConverter = ValueListInfo.get(type),
                     o.displayValue = function (item, val) { return val.caption; };
             }], options))(type);
+        ValueListInfo.get(type).loadFromDecoratorOptions();
     };
 }
 exports.ValueListFieldType = ValueListFieldType;
 var ValueListInfo = /** @class */ (function () {
     function ValueListInfo(valueListType) {
-        var e_30, _a;
         this.valueListType = valueListType;
         this.byIdMap = new Map();
         this.values = [];
         this.isNumeric = false;
+        this.loadedFromOptions = 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;
+                if (s.caption === undefined)
+                    s.caption = column_1.makeTitle(s.id !== undefined ? s.id.toString() : member);
                 this.byIdMap.set(s.id, s);
                 this.values.push(s);
             }
@@ -2283,13 +2300,32 @@ var ValueListInfo = /** @class */ (function () {
         if (this.isNumeric) {
             this.fieldTypeInDb = 'integer';
         }
-        var options = Reflect.getMetadata(exports.storableMember, valueListType);
-        if (options)
+    }
+    ValueListInfo.get = function (type) {
+        var r = typeCache.get(type);
+        if (!r) {
+            r = new ValueListInfo(type);
+            typeCache.set(type, r);
+        }
+        return r;
+    };
+    ValueListInfo.prototype.loadFromDecoratorOptions = function () {
+        var e_30, _a, _b;
+        if (this.loadedFromOptions)
+            return;
+        var options = Reflect.getMetadata(exports.storableMember, this.valueListType);
+        if (options) {
+            this.loadedFromOptions = true;
             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();
+                    if (op === null || op === void 0 ? void 0 : op.getValues) {
+                        (_b = this.values).splice.apply(_b, tslib_1.__spread([0, this.values.length], op.getValues()));
+                        this.values.forEach(function (s) {
+                            if (s.caption === undefined && s.id !== undefined)
+                                s.caption = column_1.makeTitle(s.id);
+                        });
+                    }
                 }
             }
             catch (e_30_1) { e_30 = { error: e_30_1 }; }
@@ -2299,18 +2335,16 @@ var ValueListInfo = /** @class */ (function () {
                 }
                 finally { if (e_30) throw e_30.error; }
             }
-    }
-    ValueListInfo.get = function (type) {
-        var r = typeCache.get(type);
-        if (!r)
-            r = new ValueListInfo(type);
-        typeCache.set(type, r);
-        return r;
+            if (this.values.find(function (s) { return s.id === undefined; }))
+                throw new Error("Type " + this.valueListType + " has values without an id");
+        }
     };
     ValueListInfo.prototype.getValues = function () {
+        this.loadFromDecoratorOptions();
         return this.values;
     };
     ValueListInfo.prototype.byId = function (key) {
+        this.loadFromDecoratorOptions();
         if (this.isNumeric)
             key = +key;
         return this.byIdMap.get(key);

package/src/shared-tests/db-tests.db-tests.js

@@ -111,6 +111,42 @@ db_tests_setup_1.testAll("filter works on all db or", function (_a) {
         });
     });
 }, false);
+db_tests_setup_1.testAll("filter works on all db or_1", function (_a) {
+    var createEntity = _a.createEntity;
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var s, _b;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
+                case 0: return [4 /*yield*/, entityWithValidations_1.entityWithValidations.create4RowsInDp(createEntity)];
+                case 1:
+                    s = _c.sent();
+                    _b = expect;
+                    return [4 /*yield*/, s.find({ where: { $or: [{}, {}] } })];
+                case 2:
+                    _b.apply(void 0, [(_c.sent()).length]).toBe(4);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);
+db_tests_setup_1.testAll("filter works on all db or_2", function (_a) {
+    var createEntity = _a.createEntity;
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var s, _b;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
+                case 0: return [4 /*yield*/, entityWithValidations_1.entityWithValidations.create4RowsInDp(createEntity)];
+                case 1:
+                    s = _c.sent();
+                    _b = expect;
+                    return [4 /*yield*/, s.find({ where: { $or: [{}, { myId: 3 }] } })];
+                case 2:
+                    _b.apply(void 0, [(_c.sent()).length]).toBe(4);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);
 db_tests_setup_1.testAll("entity with different id column still works well", function (_a) {
     var createEntity = _a.createEntity;
     return tslib_1.__awaiter(void 0, void 0, void 0, function () {
@@ -290,11 +326,11 @@ var testDateWithNull = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], testDateWithNull.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.DateOnly({ allowNull: true }),
+        remult3_1.Fields.dateOnly({ allowNull: true }),
         tslib_1.__metadata("design:type", Date)
     ], testDateWithNull.prototype, "d", void 0);
     testDateWithNull = tslib_1.__decorate([
@@ -778,7 +814,7 @@ db_tests_setup_1.testAll("Test unique Validation,", function (_a) {
                         return class_1;
                     }(remult_3_entities_1.Categories));
                     remult3_1.Entity('categories')(type);
-                    remult3_1.Fields.String({
+                    remult3_1.Fields.string({
                         validate: function (en, col) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
                             return tslib_1.__generator(this, function (_a) {
                                 switch (_a.label) {
@@ -840,7 +876,7 @@ db_tests_setup_1.testAll("Test unique Validation 2", function (_a) {
                         return class_2;
                     }(remult_3_entities_1.Categories));
                     remult3_1.Entity('sdfgds')(type);
-                    remult3_1.Fields.String({
+                    remult3_1.Fields.string({
                         validate: validators_1.Validators.unique
                     })(type.prototype, "a");
                     return [4 /*yield*/, createEntity(type)];
@@ -879,11 +915,11 @@ var testNumbers = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], testNumbers.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.Number(),
+        remult3_1.Fields.number(),
         tslib_1.__metadata("design:type", Number)
     ], testNumbers.prototype, "a", void 0);
     testNumbers = tslib_1.__decorate([
@@ -1123,8 +1159,8 @@ db_tests_setup_1.testAll("saves correctly to db", function (_a) {
                         return class_3;
                     }(remult3_1.EntityBase));
                     remult3_1.Entity('asdf', { allowApiCrud: true })(type);
-                    remult3_1.Fields.Number()(type.prototype, 'id');
-                    remult3_1.Fields.Boolean()(type.prototype, "ok");
+                    remult3_1.Fields.number()(type.prototype, 'id');
+                    remult3_1.Fields.boolean()(type.prototype, "ok");
                     return [4 /*yield*/, createEntity(type)];
                 case 1:
                     r = (_b.sent()).create();
@@ -1150,11 +1186,11 @@ var autoIncrement = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     tslib_1.__decorate([
-        remult3_1.Fields.AutoIncrement(),
+        remult3_1.Fields.autoIncrement(),
         tslib_1.__metadata("design:type", Number)
     ], autoIncrement.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], autoIncrement.prototype, "stam", void 0);
     autoIncrement = tslib_1.__decorate([
@@ -1270,19 +1306,19 @@ var testFilter = /** @class */ (function () {
             }]
     }); });
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], testFilter.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.String(),
+        remult3_1.Fields.string(),
         tslib_1.__metadata("design:type", String)
     ], testFilter.prototype, "a", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.String(),
+        remult3_1.Fields.string(),
         tslib_1.__metadata("design:type", String)
     ], testFilter.prototype, "b", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.String(),
+        remult3_1.Fields.string(),
         tslib_1.__metadata("design:type", String)
     ], testFilter.prototype, "c", void 0);
     testFilter = tslib_1.__decorate([
@@ -1298,11 +1334,11 @@ var testStringWithNull = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], testStringWithNull.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.String({ allowNull: true }),
+        remult3_1.Fields.string({ allowNull: true }),
         tslib_1.__metadata("design:type", String)
     ], testStringWithNull.prototype, "d", void 0);
     testStringWithNull = tslib_1.__decorate([
@@ -1319,11 +1355,11 @@ var stam = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], stam.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.String({ maxLength: 1500 }),
+        remult3_1.Fields.string({ maxLength: 1500 }),
         tslib_1.__metadata("design:type", String)
     ], stam.prototype, "title", void 0);
     stam = tslib_1.__decorate([
@@ -1340,11 +1376,11 @@ var p = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], p.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.String(),
+        remult3_1.Fields.string(),
         tslib_1.__metadata("design:type", String)
     ], p.prototype, "name", void 0);
     tslib_1.__decorate([

package/src/shared-tests/entityWithValidations.js

@@ -53,11 +53,11 @@ var entityWithValidations = /** @class */ (function (_super) {
     var entityWithValidations_1;
     entityWithValidations.savingRowCount = 0;
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], entityWithValidations.prototype, "myId", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.String(),
+        remult3_1.Fields.string(),
         tslib_1.__metadata("design:type", String)
     ], entityWithValidations.prototype, "name", void 0);
     entityWithValidations = entityWithValidations_1 = tslib_1.__decorate([

package/src/shared-tests/test-custom-id-column.spec.js

@@ -19,8 +19,8 @@ describe("custom id column", function () {
                             return class_1;
                         }(remult3_1.EntityBase));
                         remult3_1.BuildEntity(type, 'custom', {
-                            a: remult3_1.Fields.Number(),
-                            b: remult3_1.Fields.Number()
+                            a: remult3_1.Fields.number(),
+                            b: remult3_1.Fields.number()
                         }, { allowApiCrud: true });
                         return [4 /*yield*/, createEntity(type)];
                     case 1:
@@ -58,8 +58,8 @@ describe("custom id column", function () {
                             return class_2;
                         }(remult3_1.EntityBase));
                         remult3_1.Entity('custom2', { allowApiCrud: true })(type);
-                        remult3_1.Fields.Number()(type.prototype, 'a');
-                        remult3_1.Fields.Number()(type.prototype, 'id');
+                        remult3_1.Fields.number()(type.prototype, 'a');
+                        remult3_1.Fields.number()(type.prototype, 'id');
                         return [4 /*yield*/, createEntity(type)];
                     case 1:
                         c = _c.sent();

package/src/shared-tests/test-special-value.spec.js

@@ -66,7 +66,7 @@ var testGroups = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], testGroups.prototype, "id", void 0);
     tslib_1.__decorate([

package/src/shared-tests/test-update-with-null.spec.js

@@ -11,7 +11,7 @@ var testNull = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], testNull.prototype, "id", void 0);
     tslib_1.__decorate([

package/src/tests/c.js

@@ -12,11 +12,11 @@ var c = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], c.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.String(),
+        remult3_1.Fields.string(),
         tslib_1.__metadata("design:type", String)
     ], c.prototype, "name", void 0);
     c = tslib_1.__decorate([

package/src/tests/d.js

@@ -20,11 +20,11 @@ var d = /** @class */ (function (_super) {
     };
     d.count = 0;
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], d.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], d.prototype, "b", void 0);
     tslib_1.__decorate([

package/src/tests/dWithPrefilter.js

@@ -21,11 +21,11 @@ var dWithPrefilter = /** @class */ (function (_super) {
     var dWithPrefilter_1;
     dWithPrefilter.count = 0;
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], dWithPrefilter.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], dWithPrefilter.prototype, "b", void 0);
     tslib_1.__decorate([

package/src/tests/entityForCustomFilter.js

@@ -46,7 +46,7 @@ var entityForCustomFilter = /** @class */ (function (_super) {
     entityForCustomFilter.testNumericValue = filter_interfaces_1.Filter.createCustom(function (r, val) { return ({ id: val }); });
     entityForCustomFilter.testObjectValue = filter_interfaces_1.Filter.createCustom(function (r, val) { return ({ id: val.val }); });
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], entityForCustomFilter.prototype, "id", void 0);
     entityForCustomFilter = entityForCustomFilter_1 = tslib_1.__decorate([

package/src/tests/entityWithValidationsOnColumn.js

@@ -9,11 +9,11 @@ var entityWithValidationsOnColumn = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], entityWithValidationsOnColumn.prototype, "myId", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.String({
+        remult3_1.Fields.string({
             validate: function (t, c) {
                 if (!t.name || t.name.length < 3)
                     c.error = 'invalid on column';

package/src/tests/h.js

@@ -11,7 +11,7 @@ var h = /** @class */ (function (_super) {
     h_1 = h;
     var h_1;
     tslib_1.__decorate([
-        remult3_1.Fields.String(),
+        remult3_1.Fields.string(),
         tslib_1.__metadata("design:type", String)
     ], h.prototype, "id", void 0);
     tslib_1.__decorate([
@@ -19,7 +19,7 @@ var h = /** @class */ (function (_super) {
         tslib_1.__metadata("design:type", h)
     ], h.prototype, "refH", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.String(),
+        remult3_1.Fields.string(),
         tslib_1.__metadata("design:type", String)
     ], h.prototype, "refHId", void 0);
     h = h_1 = tslib_1.__decorate([

package/src/tests/remult-3-entities.js

@@ -8,23 +8,23 @@ var Products = /** @class */ (function () {
     function Products() {
     }
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], Products.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.String(),
+        remult3_1.Fields.string(),
         tslib_1.__metadata("design:type", String)
     ], Products.prototype, "name", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.Number(),
+        remult3_1.Fields.number(),
         tslib_1.__metadata("design:type", Number)
     ], Products.prototype, "price", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.Boolean(),
+        remult3_1.Fields.boolean(),
         tslib_1.__metadata("design:type", Boolean)
     ], Products.prototype, "archived", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.Date(),
+        remult3_1.Fields.date(),
         tslib_1.__metadata("design:type", Date)
     ], Products.prototype, "availableFrom", void 0);
     Products = tslib_1.__decorate([
@@ -42,27 +42,27 @@ var Categories = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Fields.Number({
+        remult3_1.Fields.number({
             dbName: 'CategoryID'
         }),
         tslib_1.__metadata("design:type", Number)
     ], Categories.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.String({ allowNull: true }),
+        remult3_1.Fields.string({ allowNull: true }),
         tslib_1.__metadata("design:type", String)
     ], Categories.prototype, "categoryName", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.String(),
+        remult3_1.Fields.string(),
         tslib_1.__metadata("design:type", String)
     ], Categories.prototype, "description", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.Number({
+        remult3_1.Fields.number({
             serverExpression: function (c) { return c.categoryName ? c.categoryName.length : undefined; }
         }),
         tslib_1.__metadata("design:type", Number)
     ], Categories.prototype, "categoryNameLength", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.Number({
+        remult3_1.Fields.number({
             serverExpression: function (c) { return Promise.resolve(c.categoryName ? c.categoryName.length : undefined); }
         }),
         tslib_1.__metadata("design:type", Number)

package/src/tests/tasks.js

@@ -11,15 +11,15 @@ var tasks = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Fields.Integer(),
+        remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], tasks.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.String(),
+        remult3_1.Fields.string(),
         tslib_1.__metadata("design:type", String)
     ], tasks.prototype, "name", void 0);
     tslib_1.__decorate([
-        remult3_1.Fields.Boolean(),
+        remult3_1.Fields.boolean(),
         tslib_1.__metadata("design:type", Boolean)
     ], tasks.prototype, "completed", void 0);
     tasks = tslib_1.__decorate([