remult 0.12.2 → 0.12.6

package/package.json

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

package/remult-knex/index.d.ts

@@ -1,14 +1,16 @@
-import { DataProvider, EntityDataProvider, EntityMetadata, FieldMetadata, Filter, Remult } from "..";
+import { DataProvider, EntityDataProvider, EntityFilter, EntityMetadata, FieldMetadata, Filter, Remult } from "..";
 import { Knex } from 'knex';
 import { FilterConsumer } from "../src/filter/filter-interfaces";
-import { CustomSqlFilterObject, dbNameProvider } from "../src/filter/filter-consumer-bridge-to-sql-request";
+import { dbNameProvider } from "../src/filter/filter-consumer-bridge-to-sql-request";
 export declare class KnexDataProvider implements DataProvider {
     knex: Knex;
     constructor(knex: Knex);
     getEntityDataProvider(entity: EntityMetadata<any>): EntityDataProvider;
     transaction(action: (dataProvider: DataProvider) => Promise<void>): Promise<void>;
+    static customFilter(build: CustomKnexFilterBuilderFunction): EntityFilter<any>;
     supportsCustomFilter?: boolean;
 }
+export declare type CustomKnexFilterBuilderFunction = () => Promise<(builder: Knex.QueryBuilder) => void>;
 export declare class FilterConsumerBridgeToKnexRequest implements FilterConsumer {
     private nameProvider;
     _addWhere: boolean;
@@ -29,7 +31,9 @@ export declare class FilterConsumerBridgeToKnexRequest implements FilterConsumer
     isLessThan(col: FieldMetadata, val: any): void;
     containsCaseInsensitive(col: FieldMetadata, val: any): void;
     private add;
-    databaseCustom(databaseCustom: CustomSqlFilterObject): void;
+    databaseCustom(databaseCustom: {
+        buildKnex: CustomKnexFilterBuilderFunction;
+    }): void;
 }
 export declare class KnexSchemaBuilder {
     private knex;

package/remult-knex/index.js

@@ -4,6 +4,7 @@ exports.createKnexDataProvider = exports.buildColumn = exports.KnexSchemaBuilder
 var tslib_1 = require("tslib");
 var __1 = require("..");
 var knex_1 = require("knex");
+var filter_interfaces_1 = require("../src/filter/filter-interfaces");
 var filter_consumer_bridge_to_sql_request_1 = require("../src/filter/filter-consumer-bridge-to-sql-request");
 var context_1 = require("../src/context");
 var valueConverters_1 = require("../valueConverters");
@@ -43,6 +44,14 @@ var KnexDataProvider = /** @class */ (function () {
             });
         });
     };
+    KnexDataProvider.customFilter = function (build) {
+        var _a;
+        return _a = {},
+            _a[filter_interfaces_1.customDatabaseFilterToken] = {
+                buildKnex: build
+            },
+            _a;
+    };
     return KnexDataProvider;
 }());
 exports.KnexDataProvider = KnexDataProvider;
@@ -364,7 +373,6 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
     };
     FilterConsumerBridgeToKnexRequest.prototype.or = function (orElements) {
         var _this = this;
-        var statement = '';
         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 e_5, _a;
@@ -476,16 +484,22 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
         this.result.push(function (b) { return b.where(_this.nameProvider.nameOf(col), operator, col.valueConverter.toDb(val)); });
     };
     FilterConsumerBridgeToKnexRequest.prototype.databaseCustom = function (databaseCustom) {
-        throw "error";
-        //   this.promises.push((async () => {
-        //     if (databaseCustom?.buildSql) {
-        //       let item = new CustomSqlFilterBuilder(this.knex);
-        //       await databaseCustom.buildSql(item);
-        //       if (item.sql) {
-        //         this.addToWhere("(" + item.sql + ")");
-        //       }
-        //     }
-        //   })());
+        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:
+                        if (!(databaseCustom === null || databaseCustom === void 0 ? void 0 : databaseCustom.buildKnex)) return [3 /*break*/, 2];
+                        _b = (_a = this.result).push;
+                        return [4 /*yield*/, databaseCustom.buildKnex()];
+                    case 1:
+                        _b.apply(_a, [_c.sent()]);
+                        _c.label = 2;
+                    case 2: return [2 /*return*/];
+                }
+            });
+        }); })());
     };
     return FilterConsumerBridgeToKnexRequest;
 }());

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

@@ -20,6 +20,9 @@ var entityForCustomFilter_1 = require("../tests/entityForCustomFilter");
 var entityWithValidationsOnColumn_1 = require("../tests/entityWithValidationsOnColumn");
 var validators_1 = require("../validators");
 var models_1 = require("../tests/testModel/models");
+var backend_database_test_setup_backend_spec_1 = require("../backend-tests/backend-database-test-setup.backend-spec");
+var __1 = require("../..");
+var remult_knex_1 = require("../../remult-knex");
 db_tests_setup_1.testAll("what", function (_a) {
     var remult = _a.remult, createEntity = _a.createEntity;
     return tslib_1.__awaiter(void 0, void 0, void 0, function () {
@@ -1234,6 +1237,115 @@ db_tests_setup_1.testAll("filter", function (_a) {
         });
     });
 }, false);
+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 () {
+        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: __1.SqlDatabase.customFilter(function (build) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                                return tslib_1.__generator(this, function (_a) {
+                                    build.sql = s.metadata.fields.myId.options.dbName + ' in (1,3)';
+                                    return [2 /*return*/];
+                                });
+                            }); })
+                        })];
+                case 2:
+                    _b.apply(void 0, [(_c.sent()).length]).toBe(2);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);
+backend_database_test_setup_backend_spec_1.testPostgresImplementation("sql filter2", 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: [
+                                    __1.SqlDatabase.customFilter(function (build) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                                        return tslib_1.__generator(this, function (_a) {
+                                            build.sql = s.metadata.fields.myId.options.dbName + ' in (1,3)';
+                                            return [2 /*return*/];
+                                        });
+                                    }); }),
+                                    {
+                                        myId: 2
+                                    }
+                                ]
+                            }
+                        })];
+                case 2:
+                    _b.apply(void 0, [(_c.sent()).length]).toBe(3);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);
+backend_database_test_setup_backend_spec_1.testKnexPGSqlImpl("knex 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*/, entityWithValidations_1.entityWithValidations.create4RowsInDp(createEntity)];
+                case 1:
+                    s = _c.sent();
+                    _b = expect;
+                    return [4 /*yield*/, s.find({
+                            where: remult_knex_1.KnexDataProvider.customFilter(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                                return tslib_1.__generator(this, function (_a) {
+                                    return [2 /*return*/, function (build) { return build.whereIn(s.metadata.fields.myId.options.dbName, [1, 3]); }];
+                                });
+                            }); })
+                        })];
+                case 2:
+                    _b.apply(void 0, [(_c.sent()).length]).toBe(2);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);
+backend_database_test_setup_backend_spec_1.testKnexPGSqlImpl("knex filter2", 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: [remult_knex_1.KnexDataProvider.customFilter(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                                        return tslib_1.__generator(this, function (_a) {
+                                            return [2 /*return*/, function (build) { return build.whereIn(s.metadata.fields.myId.options.dbName, [1, 3]); }];
+                                        });
+                                    }); }), {
+                                        myId: 4
+                                    }]
+                            }
+                        })];
+                case 2:
+                    _b.apply(void 0, [(_c.sent()).length]).toBe(3);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);
 var testFilter = /** @class */ (function () {
     function testFilter() {
         this.id = 0;