remult 0.11.1 → 0.12.1

package/src/data-providers/web-sql-data-provider.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSqlDataProvider = void 0;
 var tslib_1 = require("tslib");
 var sql_database_1 = require("./sql-database");
+var filter_consumer_bridge_to_sql_request_1 = require("../filter/filter-consumer-bridge-to-sql-request");
 //SqlDatabase.LogToConsole = true;
 var WebSqlDataProvider = /** @class */ (function () {
     function WebSqlDataProvider(databaseName) {
@@ -27,19 +28,18 @@ var WebSqlDataProvider = /** @class */ (function () {
     };
     WebSqlDataProvider.prototype.dropTable = function (entity) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var sql, _a;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _a = 'drop  table if exists ';
-                        return [4 /*yield*/, entity.getDbName()];
+            var e, sql;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.getDbNameProvider(entity)];
                     case 1:
-                        sql = _a + (_b.sent());
+                        e = _a.sent();
+                        sql = 'drop  table if exists ' + e.entityName;
                         if (sql_database_1.SqlDatabase.LogToConsole)
                             console.log(sql);
                         return [4 /*yield*/, this.createCommand().execute(sql)];
                     case 2:
-                        _b.sent();
+                        _a.sent();
                         return [2 /*return*/];
                 }
             });
@@ -47,62 +47,44 @@ var WebSqlDataProvider = /** @class */ (function () {
     };
     WebSqlDataProvider.prototype.createTable = function (entity) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var result, _a, _b, x, _c, _d, _e, e_1_1, sql, _f;
-            var e_1, _g;
-            return tslib_1.__generator(this, function (_h) {
-                switch (_h.label) {
+            var result, e, _a, _b, x, sql;
+            var e_1, _c;
+            return tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         result = '';
-                        _h.label = 1;
+                        return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.getDbNameProvider(entity)];
                     case 1:
-                        _h.trys.push([1, 7, 8, 9]);
-                        _a = tslib_1.__values(entity.fields), _b = _a.next();
-                        _h.label = 2;
-                    case 2:
-                        if (!!_b.done) return [3 /*break*/, 6];
-                        x = _b.value;
-                        return [4 /*yield*/, sql_database_1.isDbReadonly(x)];
-                    case 3:
-                        if (!!(_h.sent())) return [3 /*break*/, 5];
-                        if (result.length != 0)
-                            result += ',';
-                        result += '\r\n  ';
-                        _c = result;
-                        _d = this.addColumnSqlSyntax;
-                        _e = [x];
-                        return [4 /*yield*/, x.getDbName()];
-                    case 4:
-                        result = _c + _d.apply(this, _e.concat([_h.sent()]));
-                        if (x.key == entity.idMetadata.field.key) {
-                            result += ' primary key';
-                            if (entity.options.dbAutoIncrementId)
-                                result += " autoincrement";
-                        }
-                        _h.label = 5;
-                    case 5:
-                        _b = _a.next();
-                        return [3 /*break*/, 2];
-                    case 6: return [3 /*break*/, 9];
-                    case 7:
-                        e_1_1 = _h.sent();
-                        e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 9];
-                    case 8:
+                        e = _d.sent();
                         try {
-                            if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
+                            for (_a = tslib_1.__values(entity.fields), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                x = _b.value;
+                                if (!e.isDbReadonly(x)) {
+                                    if (result.length != 0)
+                                        result += ',';
+                                    result += '\r\n  ';
+                                    result += this.addColumnSqlSyntax(x, e.nameOf(x));
+                                    if (x.key == entity.idMetadata.field.key) {
+                                        result += ' primary key';
+                                        if (entity.options.dbAutoIncrementId)
+                                            result += " autoincrement";
+                                    }
+                                }
+                            }
                         }
-                        finally { if (e_1) throw e_1.error; }
-                        return [7 /*endfinally*/];
-                    case 9:
-                        _f = 'create table if not exists ';
-                        return [4 /*yield*/, entity.getDbName()];
-                    case 10:
-                        sql = _f + (_h.sent()) + ' (' + result + '\r\n)';
+                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                        finally {
+                            try {
+                                if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                            }
+                            finally { if (e_1) throw e_1.error; }
+                        }
+                        sql = 'create table if not exists ' + e.entityName + ' (' + result + '\r\n)';
                         if (sql_database_1.SqlDatabase.LogToConsole)
                             console.log(sql);
                         return [4 /*yield*/, this.createCommand().execute(sql)];
-                    case 11:
-                        _h.sent();
+                    case 2:
+                        _d.sent();
                         return [2 /*return*/];
                 }
             });

package/src/filter/filter-consumer-bridge-to-sql-request.d.ts

@@ -1,13 +1,15 @@
 import { SqlCommand } from "../sql-command";
 import { Filter, FilterConsumer } from './filter-interfaces';
 import { FieldMetadata } from "../column-interfaces";
+import { EntityMetadata } from "../..";
 export declare class FilterConsumerBridgeToSqlRequest implements FilterConsumer {
     private r;
+    private nameProvider;
     private where;
     _addWhere: boolean;
     promises: Promise<void>[];
     resolveWhere(): Promise<string>;
-    constructor(r: SqlCommand);
+    constructor(r: SqlCommand, nameProvider: dbNameProvider);
     custom(key: string, customItem: any): void;
     or(orElements: Filter[]): void;
     isNull(col: FieldMetadata): void;
@@ -34,3 +36,15 @@ export declare class CustomSqlFilterBuilder {
     sql: string;
     addParameterAndReturnSqlToken<valueType>(val: valueType, field?: FieldMetadata<valueType>): string;
 }
+export declare function getDbNameProvider(meta: EntityMetadata): Promise<dbNameProvider>;
+export declare class dbNameProviderImpl {
+    map: Map<string, string>;
+    nameOf(field: FieldMetadata<any>): string;
+    entityName: string;
+    isDbReadonly(x: FieldMetadata): boolean;
+}
+export interface dbNameProvider {
+    nameOf(field: FieldMetadata<any>): string;
+    entityName: string;
+    isDbReadonly(x: FieldMetadata): boolean;
+}

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

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomSqlFilterBuilder = exports.FilterConsumerBridgeToSqlRequest = void 0;
+exports.dbNameProviderImpl = exports.getDbNameProvider = exports.CustomSqlFilterBuilder = exports.FilterConsumerBridgeToSqlRequest = void 0;
 var tslib_1 = require("tslib");
 var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
-    function FilterConsumerBridgeToSqlRequest(r) {
+    function FilterConsumerBridgeToSqlRequest(r, nameProvider) {
         this.r = r;
+        this.nameProvider = nameProvider;
         this.where = "";
         this._addWhere = true;
         this.promises = [];
@@ -69,7 +70,7 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
                     case 1:
                         if (!!orElements_1_1.done) return [3 /*break*/, 4];
                         element = orElements_1_1.value;
-                        f = new FilterConsumerBridgeToSqlRequest(this.r);
+                        f = new FilterConsumerBridgeToSqlRequest(this.r, this.nameProvider);
                         f._addWhere = false;
                         element.__applyToConsumer(f);
                         return [4 /*yield*/, f.resolveWhere()];
@@ -109,45 +110,26 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
     };
     FilterConsumerBridgeToSqlRequest.prototype.isNull = function (col) {
         var _this = this;
-        this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { var _a; return tslib_1.__generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    _a = this.addToWhere;
-                    return [4 /*yield*/, col.getDbName()];
-                case 1: return [2 /*return*/, _a.apply(this, [(_b.sent()) + ' is null'])];
-            }
+        this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+            return [2 /*return*/, this.addToWhere(this.nameProvider.nameOf(col) + ' is null')];
         }); }); })());
     };
     FilterConsumerBridgeToSqlRequest.prototype.isNotNull = function (col) {
         var _this = this;
-        this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { var _a; return tslib_1.__generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    _a = this.addToWhere;
-                    return [4 /*yield*/, col.getDbName()];
-                case 1: return [2 /*return*/, _a.apply(this, [(_b.sent()) + ' is not null'])];
-            }
+        this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+            return [2 /*return*/, this.addToWhere(this.nameProvider.nameOf(col) + ' is not null')];
         }); }); })());
     };
     FilterConsumerBridgeToSqlRequest.prototype.isIn = function (col, val) {
         var _this = this;
         this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var _a;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        if (!(val && val.length > 0)) return [3 /*break*/, 2];
-                        _a = this.addToWhere;
-                        return [4 /*yield*/, col.getDbName()];
-                    case 1:
-                        _a.apply(this, [(_b.sent()) + " in (" + val.map(function (x) { return _this.r.addParameterAndReturnSqlToken(col.valueConverter.toDb(x)); }).join(",") + ")"]);
-                        return [3 /*break*/, 3];
-                    case 2:
-                        this.addToWhere('1 = 0 /*isIn with no values*/');
-                        _b.label = 3;
-                    case 3: return [2 /*return*/];
-                }
+            return tslib_1.__generator(this, function (_a) {
+                if (val && val.length > 0)
+                    this.addToWhere(this.nameProvider.nameOf(col) + " in (" + val.map(function (x) { return _this.r.addParameterAndReturnSqlToken(col.valueConverter.toDb(x)); }).join(",") + ")");
+                else
+                    this.addToWhere('1 = 0 /*isIn with no values*/');
+                return [2 /*return*/];
             });
         }); })());
     };
@@ -172,17 +154,9 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
     FilterConsumerBridgeToSqlRequest.prototype.containsCaseInsensitive = function (col, val) {
         var _this = this;
         this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var _a, _b;
-            return tslib_1.__generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        _a = this.addToWhere;
-                        _b = 'lower (';
-                        return [4 /*yield*/, col.getDbName()];
-                    case 1:
-                        _a.apply(this, [_b + (_c.sent()) + ") like lower ('%" + val.replace(/'/g, '\'\'') + "%')"]);
-                        return [2 /*return*/];
-                }
+            return tslib_1.__generator(this, function (_a) {
+                this.addToWhere('lower (' + this.nameProvider.nameOf(col) + ") like lower ('%" + val.replace(/'/g, '\'\'') + "%')");
+                return [2 /*return*/];
             });
         }); })());
     };
@@ -191,13 +165,9 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
         this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             var x;
             return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, col.getDbName()];
-                    case 1:
-                        x = (_a.sent()) + ' ' + operator + ' ' + this.r.addParameterAndReturnSqlToken(col.valueConverter.toDb(val));
-                        this.addToWhere(x);
-                        return [2 /*return*/];
-                }
+                x = this.nameProvider.nameOf(col) + ' ' + operator + ' ' + this.r.addParameterAndReturnSqlToken(col.valueConverter.toDb(val));
+                this.addToWhere(x);
+                return [2 /*return*/];
             });
         }); })());
     };
@@ -247,3 +217,63 @@ var CustomSqlFilterBuilder = /** @class */ (function () {
     return CustomSqlFilterBuilder;
 }());
 exports.CustomSqlFilterBuilder = CustomSqlFilterBuilder;
+function getDbNameProvider(meta) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var result, _a, _b, f, _c, _d, _e, e_3_1, _f;
+        var e_3, _g;
+        return tslib_1.__generator(this, function (_h) {
+            switch (_h.label) {
+                case 0:
+                    result = new dbNameProviderImpl();
+                    _h.label = 1;
+                case 1:
+                    _h.trys.push([1, 6, 7, 8]);
+                    _a = tslib_1.__values(meta.fields), _b = _a.next();
+                    _h.label = 2;
+                case 2:
+                    if (!!_b.done) return [3 /*break*/, 5];
+                    f = _b.value;
+                    _d = (_c = result.map).set;
+                    _e = [f.key];
+                    return [4 /*yield*/, f.getDbName()];
+                case 3:
+                    _d.apply(_c, _e.concat([_h.sent()]));
+                    _h.label = 4;
+                case 4:
+                    _b = _a.next();
+                    return [3 /*break*/, 2];
+                case 5: return [3 /*break*/, 8];
+                case 6:
+                    e_3_1 = _h.sent();
+                    e_3 = { error: e_3_1 };
+                    return [3 /*break*/, 8];
+                case 7:
+                    try {
+                        if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
+                    }
+                    finally { if (e_3) throw e_3.error; }
+                    return [7 /*endfinally*/];
+                case 8:
+                    _f = result;
+                    return [4 /*yield*/, meta.getDbName()];
+                case 9:
+                    _f.entityName = _h.sent();
+                    return [2 /*return*/, result];
+            }
+        });
+    });
+}
+exports.getDbNameProvider = getDbNameProvider;
+var dbNameProviderImpl = /** @class */ (function () {
+    function dbNameProviderImpl() {
+        this.map = new Map();
+    }
+    dbNameProviderImpl.prototype.nameOf = function (field) {
+        return this.map.get(field.key);
+    };
+    dbNameProviderImpl.prototype.isDbReadonly = function (x) {
+        return (x.dbReadOnly || x.isServerExpression || this.nameOf(x) != x.options.dbName);
+    };
+    return dbNameProviderImpl;
+}());
+exports.dbNameProviderImpl = dbNameProviderImpl;

package/src/remult3/RepositoryImplementation.d.ts

@@ -218,6 +218,10 @@ interface columnInfo {
     key: string;
     settings: (remult: Remult) => FieldOptions;
 }
+export declare type BuildEntityFields<entityType> = {
+    [Properties in keyof Partial<OmitEB<entityType>>]: any;
+};
+export declare function BuildEntity<entityType>(c: ClassType<entityType>, key: string, fields: BuildEntityFields<entityType>, ...options: (EntityOptions<entityType> | ((options: EntityOptions<entityType>, remult: Remult) => void))[]): void;
 export declare function Entity<entityType>(key: string, ...options: (EntityOptions<entityType> | ((options: EntityOptions<entityType>, remult: Remult) => void))[]): (target: any) => any;
 export declare class EntityBase {
     get _(): EntityRef<this>;

package/src/remult3/RepositoryImplementation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControllerBase = exports.EntityBase = exports.Entity = 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.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;
 var tslib_1 = require("tslib");
 var column_1 = require("../column");
 var context_1 = require("../context");
@@ -2337,6 +2337,20 @@ function decorateColumnSettings(settings, remult) {
     return settings;
 }
 exports.decorateColumnSettings = decorateColumnSettings;
+function BuildEntity(c, key, fields) {
+    var options = [];
+    for (var _i = 3; _i < arguments.length; _i++) {
+        options[_i - 3] = arguments[_i];
+    }
+    Entity.apply(void 0, tslib_1.__spread([key], options))(c);
+    for (var fieldKey in fields) {
+        if (Object.prototype.hasOwnProperty.call(fields, fieldKey)) {
+            var element = fields[fieldKey];
+            element(c.prototype, fieldKey);
+        }
+    }
+}
+exports.BuildEntity = BuildEntity;
 function Entity(key) {
     var options = [];
     for (var _i = 1; _i < arguments.length; _i++) {

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

@@ -1198,11 +1198,11 @@ db_tests_setup_1.testAll("Paging", function (_a) {
                 case 1:
                     s = _d.sent();
                     _b = expect;
-                    return [4 /*yield*/, s.find({ limit: 3 })];
+                    return [4 /*yield*/, s.find({ limit: 3, orderBy: { myId: "asc" } })];
                 case 2:
                     _b.apply(void 0, [(_d.sent()).length]).toBe(3);
                     _c = expect;
-                    return [4 /*yield*/, s.find({ limit: 3, page: 2 })];
+                    return [4 /*yield*/, s.find({ limit: 3, orderBy: { myId: "asc" }, page: 2 })];
                 case 3:
                     _c.apply(void 0, [(_d.sent()).length]).toBe(1);
                     return [2 /*return*/];
@@ -1210,6 +1210,67 @@ db_tests_setup_1.testAll("Paging", function (_a) {
         });
     });
 }, false);
+db_tests_setup_1.testAll("filter", 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*/, createEntity(testFilter)];
+                case 1:
+                    s = _c.sent();
+                    return [4 /*yield*/, s.insert({ id: 1, a: 'a', b: 'b', c: 'c' })];
+                case 2:
+                    _c.sent();
+                    _b = expect;
+                    return [4 /*yield*/, s.count({
+                            a: 'z',
+                            $and: [testFilter.search('')]
+                        })];
+                case 3:
+                    _b.apply(void 0, [_c.sent()]).toBe(0);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);
+var testFilter = /** @class */ (function () {
+    function testFilter() {
+        this.id = 0;
+        this.a = '';
+        this.b = '';
+        this.c = '';
+    }
+    testFilter.search = filter_interfaces_1.Filter.createCustom(function (remult, str) { return ({
+        $and: [{
+                $or: [
+                    { a: 'a' },
+                    { b: 'a' },
+                    { c: 'a' }
+                ]
+            }]
+    }); });
+    tslib_1.__decorate([
+        remult3_1.Field(),
+        tslib_1.__metadata("design:type", Number)
+    ], testFilter.prototype, "id", void 0);
+    tslib_1.__decorate([
+        remult3_1.Field(),
+        tslib_1.__metadata("design:type", String)
+    ], testFilter.prototype, "a", void 0);
+    tslib_1.__decorate([
+        remult3_1.Field(),
+        tslib_1.__metadata("design:type", String)
+    ], testFilter.prototype, "b", void 0);
+    tslib_1.__decorate([
+        remult3_1.Field(),
+        tslib_1.__metadata("design:type", String)
+    ], testFilter.prototype, "c", void 0);
+    testFilter = tslib_1.__decorate([
+        remult3_1.Entity("testfilter", { allowApiCrud: true })
+    ], testFilter);
+    return testFilter;
+}());
 var testStringWithNull = /** @class */ (function (_super) {
     tslib_1.__extends(testStringWithNull, _super);
     function testStringWithNull() {

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

@@ -18,9 +18,10 @@ describe("custom id column", function () {
                             }
                             return class_1;
                         }(remult3_1.EntityBase));
-                        remult3_1.Entity('custom', { allowApiCrud: true })(type);
-                        remult3_1.Field()(type.prototype, 'a');
-                        remult3_1.Field()(type.prototype, 'b');
+                        remult3_1.BuildEntity(type, 'custom', {
+                            a: remult3_1.Field(),
+                            b: remult3_1.Field()
+                        }, { allowApiCrud: true });
                         return [4 /*yield*/, createEntity(type)];
                     case 1:
                         c = _b.sent();

package/src/tests/entityForCustomFilter.js

@@ -6,6 +6,7 @@ var sql_database_1 = require("../data-providers/sql-database");
 var remult3_1 = require("../remult3");
 var filter_interfaces_1 = require("../filter/filter-interfaces");
 var array_entity_data_provider_1 = require("../data-providers/array-entity-data-provider");
+var filter_consumer_bridge_to_sql_request_1 = require("../filter/filter-consumer-bridge-to-sql-request");
 var entityForCustomFilter = /** @class */ (function (_super) {
     tslib_1.__extends(entityForCustomFilter, _super);
     function entityForCustomFilter() {
@@ -14,30 +15,31 @@ var entityForCustomFilter = /** @class */ (function (_super) {
     entityForCustomFilter_1 = entityForCustomFilter;
     var entityForCustomFilter_1;
     entityForCustomFilter.filter = filter_interfaces_1.Filter.createCustom(function (remult, c) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-        var r, e_1;
+        var r, meta_1, e_1;
         return tslib_1.__generator(this, function (_a) {
-            r = [];
-            if (c.oneAndThree)
-                r.push({ id: [1, 3] });
-            if (c.two)
-                r.push({ id: 2 });
-            if (c.dbOneOrThree) {
-                e_1 = remult.repo(entityForCustomFilter_1).metadata;
-                r.push({
-                    $and: [
-                        sql_database_1.SqlDatabase.customFilter(function (x) { return tslib_1.__awaiter(void 0, void 0, void 0, function () { var _a; return tslib_1.__generator(this, function (_b) {
-                            switch (_b.label) {
-                                case 0:
-                                    _a = x;
-                                    return [4 /*yield*/, e_1.fields.id.getDbName()];
-                                case 1: return [2 /*return*/, _a.sql = (_b.sent()) + ' in (' + x.addParameterAndReturnSqlToken(1) + "," + x.addParameterAndReturnSqlToken(3) + ")"];
-                            }
-                        }); }); }),
-                        array_entity_data_provider_1.ArrayEntityDataProvider.customFilter(function (x) { return x.id == 1 || x.id == 3; })
-                    ]
-                });
+            switch (_a.label) {
+                case 0:
+                    r = [];
+                    if (c.oneAndThree)
+                        r.push({ id: [1, 3] });
+                    if (c.two)
+                        r.push({ id: 2 });
+                    if (!c.dbOneOrThree) return [3 /*break*/, 2];
+                    meta_1 = remult.repo(entityForCustomFilter_1).metadata;
+                    return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.getDbNameProvider(meta_1)];
+                case 1:
+                    e_1 = _a.sent();
+                    r.push({
+                        $and: [
+                            sql_database_1.SqlDatabase.customFilter(function (x) { return tslib_1.__awaiter(void 0, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+                                return [2 /*return*/, x.sql = e_1.nameOf(meta_1.fields.id) + ' in (' + x.addParameterAndReturnSqlToken(1) + "," + x.addParameterAndReturnSqlToken(3) + ")"];
+                            }); }); }),
+                            array_entity_data_provider_1.ArrayEntityDataProvider.customFilter(function (x) { return x.id == 1 || x.id == 3; })
+                        ]
+                    });
+                    _a.label = 2;
+                case 2: return [2 /*return*/, { $and: r }];
             }
-            return [2 /*return*/, { $and: r }];
         });
     }); });
     entityForCustomFilter.oneAndThree = filter_interfaces_1.Filter.createCustom(function () { return ({ id: [1, 3] }); });

package/valueConverters.js

@@ -42,7 +42,7 @@ exports.DateOnlyValueConverter = {
     toInput: function (x) { return exports.DateOnlyValueConverter.toJson(x); },
     toJson: function (val) {
         var d = val;
-        if (typeof d === "string")
+        if (typeof d === "string" || typeof (d) === "number")
             d = new Date(d);
         if (!d || d == null)
             return null;