remult 0.11.2 → 0.11.3

package/package.json

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

package/remult-knex/index.js

@@ -366,11 +366,12 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
         var _this = this;
         var statement = '';
         this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var _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, e_5_1;
             var e_5, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
+                        result = [];
                         _loop_1 = function (element) {
                             var f, where;
                             return tslib_1.__generator(this, function (_a) {
@@ -383,7 +384,7 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                                     case 1:
                                         where = _a.sent();
                                         if (where.length > 0) {
-                                            this_1.result.push(function (b) {
+                                            result.push(function (b) {
                                                 b.orWhere(function (b) {
                                                     where.forEach(function (x) { return x(b); });
                                                 });
@@ -420,7 +421,11 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                         }
                         finally { if (e_5) throw e_5.error; }
                         return [7 /*endfinally*/];
-                    case 8: return [2 /*return*/];
+                    case 8:
+                        if (result.length > 0) {
+                            this.result.push(function (b) { return b.where(function (x) { return result.find(function (y) { return y(x); }); }); });
+                        }
+                        return [2 /*return*/];
                 }
             });
         }); })());

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

@@ -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() {