remult 0.10.13 → 0.10.16

package/package.json

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

package/server/expressBridge.d.ts

@@ -5,11 +5,16 @@ import { queuedJobInfoResponse } from '../src/server-action';
 import { DataApi, DataApiRequest, DataApiResponse } from '../src/data-api';
 import { AllowedForInstance } from '../src/context';
 export declare function remultExpress(options?: {
+    /** Determines the Data Provider
+  
+  * @see  [Optional Databases](https://remult.dev/docs/databases.html)
+  */
     dataProvider?: DataProvider | Promise<DataProvider> | (() => Promise<DataProvider | undefined>);
     bodySizeLimit?: string;
     disableAutoApi?: boolean;
     queueStorage?: QueueStorage;
     initRequest?: (remult: Remult, origReq: express.Request) => Promise<void>;
+    initApi?: (remult: Remult) => void | Promise<void>;
     logApiEndPoints?: boolean;
     defaultGetLimit?: number;
 }): RemultExpressBridge;

package/server/expressBridge.js

@@ -14,6 +14,7 @@ var server_action_1 = require("../src/server-action");
 var data_api_1 = require("../src/data-api");
 var context_1 = require("../src/context");
 function remultExpress(options) {
+    var _this = this;
     var app = express.Router();
     if (!options) {
         options = {};
@@ -41,6 +42,21 @@ function remultExpress(options) {
             return dp;
         return new json_data_provider_1.JsonDataProvider(new JsonEntityFileStorage_1.JsonEntityFileStorage('./db'));
     });
+    if (options.initApi) {
+        dataProvider = dataProvider.then(function (dp) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var remult;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        remult = new __1.Remult(dp);
+                        return [4 /*yield*/, options.initApi(remult)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/, dp];
+                }
+            });
+        }); });
+    }
     var bridge = new ExpressBridge(app, new inProcessQueueHandler(options.queueStorage), options.initRequest, dataProvider);
     if (options.logApiEndPoints !== undefined)
         bridge.logApiEndPoints = options.logApiEndPoints;

package/src/data-interfaces.d.ts

@@ -29,8 +29,6 @@ export declare function extractSort(sort: any): Sort;
 export interface ErrorInfo<entityType = any> {
     message?: string;
     modelState?: {
-        [key: string]: string;
-    } & {
         [Properties in keyof Partial<OmitEB<entityType>>]?: string;
     };
     stack?: string;

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

@@ -75,6 +75,8 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
                         return [4 /*yield*/, f.resolveWhere()];
                     case 2:
                         where = _b.sent();
+                        if (!where)
+                            where = '1=1';
                         if (where.length > 0) {
                             if (statement.length > 0) {
                                 statement += " or ";

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