remult 0.17.2 → 0.18.0

package/src/tests/entityForCustomFilter.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.entityForCustomFilter1 = exports.entityForCustomFilter = void 0;
+exports.entityForrawFilter1 = exports.entityForrawFilter = void 0;
 var tslib_1 = require("tslib");
 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() {
+var entityForrawFilter = /** @class */ (function (_super) {
+    tslib_1.__extends(entityForrawFilter, _super);
+    function entityForrawFilter() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    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, meta_1, e_1;
+    entityForrawFilter_1 = entityForrawFilter;
+    var entityForrawFilter_1;
+    entityForrawFilter.filter = filter_interfaces_1.Filter.createCustom(function (c, remult) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var r, e_1;
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -25,16 +25,15 @@ var entityForCustomFilter = /** @class */ (function (_super) {
                     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)];
+                    return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.dbNamesOf(remult.repo(entityForrawFilter_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) + ")"];
+                            sql_database_1.SqlDatabase.rawFilter(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.id + ' in (' + x.addParameterAndReturnSqlToken(1) + "," + x.addParameterAndReturnSqlToken(3) + ")"];
                             }); }); }),
-                            array_entity_data_provider_1.ArrayEntityDataProvider.customFilter(function (x) { return x.id == 1 || x.id == 3; })
+                            array_entity_data_provider_1.ArrayEntityDataProvider.rawFilter(function (x) { return x.id == 1 || x.id == 3; })
                         ]
                     });
                     _a.label = 2;
@@ -42,27 +41,27 @@ var entityForCustomFilter = /** @class */ (function (_super) {
             }
         });
     }); });
-    entityForCustomFilter.oneAndThree = filter_interfaces_1.Filter.createCustom(function () { return ({ id: [1, 3] }); });
-    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 }); });
+    entityForrawFilter.oneAndThree = filter_interfaces_1.Filter.createCustom(function () { return ({ id: [1, 3] }); });
+    entityForrawFilter.testNumericValue = filter_interfaces_1.Filter.createCustom(function (val) { return ({ id: val }); });
+    entityForrawFilter.testObjectValue = filter_interfaces_1.Filter.createCustom(function (val) { return ({ id: val.val }); });
     tslib_1.__decorate([
         remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
-    ], entityForCustomFilter.prototype, "id", void 0);
-    entityForCustomFilter = entityForCustomFilter_1 = tslib_1.__decorate([
-        remult3_1.Entity('entityForCustomFilter', { allowApiCrud: true })
-    ], entityForCustomFilter);
-    return entityForCustomFilter;
+    ], entityForrawFilter.prototype, "id", void 0);
+    entityForrawFilter = entityForrawFilter_1 = tslib_1.__decorate([
+        remult3_1.Entity('entityForrawFilter', { allowApiCrud: true })
+    ], entityForrawFilter);
+    return entityForrawFilter;
 }(remult3_1.EntityBase));
-exports.entityForCustomFilter = entityForCustomFilter;
-var entityForCustomFilter1 = /** @class */ (function (_super) {
-    tslib_1.__extends(entityForCustomFilter1, _super);
-    function entityForCustomFilter1() {
+exports.entityForrawFilter = entityForrawFilter;
+var entityForrawFilter1 = /** @class */ (function (_super) {
+    tslib_1.__extends(entityForrawFilter1, _super);
+    function entityForrawFilter1() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    entityForCustomFilter1 = tslib_1.__decorate([
-        remult3_1.Entity('entityForCustomFilter1', { allowApiCrud: true })
-    ], entityForCustomFilter1);
-    return entityForCustomFilter1;
-}(entityForCustomFilter));
-exports.entityForCustomFilter1 = entityForCustomFilter1;
+    entityForrawFilter1 = tslib_1.__decorate([
+        remult3_1.Entity('entityForrawFilter1', { allowApiCrud: true })
+    ], entityForrawFilter1);
+    return entityForrawFilter1;
+}(entityForrawFilter));
+exports.entityForrawFilter1 = entityForrawFilter1;

package/src/tests/frontend-database-tests-setup.spec.js

@@ -76,18 +76,17 @@ function testRest(key, what, focus) {
     var _this = this;
     if (focus === void 0) { focus = false; }
     db_tests_setup_1.itWithFocus(key + " - Rest Provider", function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-        var r, remult, db;
+        var r, db;
         var _this = this;
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     r = new context_1.Remult();
                     r.dataProvider = (new __1.InMemoryDataProvider());
-                    remult = new context_1.Remult();
                     db = new testHelper_spec_1.MockRestDataProvider(r);
-                    remult.dataProvider = (db);
-                    return [4 /*yield*/, what({ db: db, remult: remult, createEntity: function (x) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
-                                return [2 /*return*/, remult.repo(x)];
+                    __1.remult.dataProvider = (db);
+                    return [4 /*yield*/, what({ db: db, remult: __1.remult, createEntity: function (x) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+                                return [2 /*return*/, __1.remult.repo(x)];
                             }); }); } })];
                 case 1:
                     _a.sent();
@@ -97,5 +96,5 @@ function testRest(key, what, focus) {
     }); }, focus);
 }
 exports.testRest = testRest;
-db_tests_setup_1.addDatabaseToTest(testRest);
+db_tests_setup_1.addDatabaseToTest(testRest, db_tests_setup_1.TestDbs.restDataProvider);
 require("../shared-tests/");

package/src/tests/testHelper.spec.d.ts

@@ -1,5 +1,6 @@
 import './frontend-database-tests-setup.spec';
 import { Remult } from "../context";
+import { DataApi } from "../data-api";
 import { DataProvider, EntityDataProvider } from "../data-interfaces";
 import { InMemoryDataProvider } from "../data-providers/in-memory-database";
 import { EntityMetadata } from "../remult3";
@@ -30,5 +31,6 @@ export declare class MockRestDataProvider implements DataProvider {
     constructor(remult: Remult);
     getEntityDataProvider(metadata: EntityMetadata<any>): EntityDataProvider;
     transaction(action: (dataProvider: DataProvider) => Promise<void>): Promise<void>;
-    supportsCustomFilter: boolean;
+    supportsRawFilter: boolean;
 }
+export declare function createMockHttpDataProvider(dataApi: DataApi<any>): import("../data-interfaces").RestDataProviderHttpProvider;

package/src/tests/testHelper.spec.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MockRestDataProvider = exports.testAllDataProviders = exports.testRestDb = exports.testInMemoryDb = exports.testSql = exports.ActionTestConfig = exports.testAsIfOnBackend = exports.fitForEach = exports.itForEach = void 0;
+exports.createMockHttpDataProvider = exports.MockRestDataProvider = exports.testAllDataProviders = exports.testRestDb = exports.testInMemoryDb = exports.testSql = exports.ActionTestConfig = exports.testAsIfOnBackend = exports.fitForEach = exports.itForEach = void 0;
 var tslib_1 = require("tslib");
 require("./frontend-database-tests-setup.spec");
 var context_1 = require("../context");
@@ -13,6 +13,7 @@ var server_action_1 = require("../server-action");
 var entityWithValidations_1 = require("../shared-tests/entityWithValidations");
 var TestDataApiResponse_1 = require("./TestDataApiResponse");
 var remult_proxy_1 = require("../remult-proxy");
+var buildRestDataProvider_1 = require("../buildRestDataProvider");
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 999999;
 //actionInfo.runningOnServer = false;
 function itForEach(name, arrayOfT, runAsync) {
@@ -167,14 +168,13 @@ function testSql(runAsync) {
 exports.testSql = testSql;
 function testInMemoryDb(runAsync) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var remult, db;
+        var db;
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    remult = new context_1.Remult();
                     db = new in_memory_database_1.InMemoryDataProvider();
-                    remult.dataProvider = (db);
-                    return [4 /*yield*/, runAsync({ db: db, remult: remult })];
+                    remult_proxy_1.remult.dataProvider = (db);
+                    return [4 /*yield*/, runAsync({ db: db, remult: remult_proxy_1.remult })];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
@@ -267,104 +267,11 @@ function urlToReq(url) {
 var MockRestDataProvider = /** @class */ (function () {
     function MockRestDataProvider(remult) {
         this.remult = remult;
-        this.supportsCustomFilter = true;
+        this.supportsRawFilter = true;
     }
     MockRestDataProvider.prototype.getEntityDataProvider = function (metadata) {
-        var _this = this;
         var dataApi = new data_api_1.DataApi(this.remult.repo(metadata.entityType), this.remult);
-        return new rest_data_provider_1.RestEntityDataProvider(function () { return ""; }, function () { return new context_1.HttpProviderBridgeToRestDataProviderHttpProvider({
-            delete: function (url) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var urlSplit, r, result;
-                return tslib_1.__generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            urlSplit = url.split('/');
-                            r = new TestDataApiResponse_1.TestDataApiResponse();
-                            r.deleted = function () { };
-                            _a.label = 1;
-                        case 1:
-                            _a.trys.push([1, , 3, 4]);
-                            entityWithValidations_1.testConfiguration.restDbRunningOnServer = true;
-                            return [4 /*yield*/, dataApi.delete(r, urlSplit[urlSplit.length - 1])];
-                        case 2:
-                            _a.sent();
-                            return [3 /*break*/, 4];
-                        case 3:
-                            entityWithValidations_1.testConfiguration.restDbRunningOnServer = false;
-                            return [7 /*endfinally*/];
-                        case 4: return [2 /*return*/, result];
-                    }
-                });
-            }); },
-            get: function (url) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var r, result;
-                return tslib_1.__generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            r = new TestDataApiResponse_1.TestDataApiResponse();
-                            r.success = function (data) { result = data; };
-                            _a.label = 1;
-                        case 1:
-                            _a.trys.push([1, , 3, 4]);
-                            entityWithValidations_1.testConfiguration.restDbRunningOnServer = true;
-                            return [4 /*yield*/, dataApi.httpGet(r, urlToReq(url))];
-                        case 2:
-                            _a.sent();
-                            return [3 /*break*/, 4];
-                        case 3:
-                            entityWithValidations_1.testConfiguration.restDbRunningOnServer = false;
-                            return [7 /*endfinally*/];
-                        case 4: return [2 /*return*/, result];
-                    }
-                });
-            }); },
-            post: function (url, data) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var r, result;
-                return tslib_1.__generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            r = new TestDataApiResponse_1.TestDataApiResponse();
-                            r.created = function (data) { result = data; };
-                            r.success = function (data) { result = data; };
-                            _a.label = 1;
-                        case 1:
-                            _a.trys.push([1, , 3, 4]);
-                            entityWithValidations_1.testConfiguration.restDbRunningOnServer = true;
-                            return [4 /*yield*/, dataApi.httpPost(r, urlToReq(url), data)];
-                        case 2:
-                            _a.sent();
-                            return [3 /*break*/, 4];
-                        case 3:
-                            entityWithValidations_1.testConfiguration.restDbRunningOnServer = false;
-                            return [7 /*endfinally*/];
-                        case 4: return [2 /*return*/, result];
-                    }
-                });
-            }); },
-            put: function (url, data) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var urlSplit, r, result;
-                return tslib_1.__generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            urlSplit = url.split('/');
-                            r = new TestDataApiResponse_1.TestDataApiResponse();
-                            r.success = function (data) { result = data; };
-                            _a.label = 1;
-                        case 1:
-                            _a.trys.push([1, , 3, 4]);
-                            entityWithValidations_1.testConfiguration.restDbRunningOnServer = true;
-                            return [4 /*yield*/, dataApi.put(r, urlSplit[urlSplit.length - 1], data)];
-                        case 2:
-                            _a.sent();
-                            return [3 /*break*/, 4];
-                        case 3:
-                            entityWithValidations_1.testConfiguration.restDbRunningOnServer = false;
-                            return [7 /*endfinally*/];
-                        case 4: return [2 /*return*/, result];
-                    }
-                });
-            }); }
-        }); }, metadata);
+        return new rest_data_provider_1.RestEntityDataProvider(function () { return ""; }, function () { return createMockHttpDataProvider(dataApi); }, metadata);
     };
     MockRestDataProvider.prototype.transaction = function (action) {
         throw new Error('Method not implemented.');
@@ -372,3 +279,100 @@ var MockRestDataProvider = /** @class */ (function () {
     return MockRestDataProvider;
 }());
 exports.MockRestDataProvider = MockRestDataProvider;
+function createMockHttpDataProvider(dataApi) {
+    var _this = this;
+    return new buildRestDataProvider_1.HttpProviderBridgeToRestDataProviderHttpProvider({
+        delete: function (url) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var urlSplit, r, result;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        urlSplit = url.split('/');
+                        r = new TestDataApiResponse_1.TestDataApiResponse();
+                        r.deleted = function () { };
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, , 3, 4]);
+                        entityWithValidations_1.testConfiguration.restDbRunningOnServer = true;
+                        return [4 /*yield*/, dataApi.delete(r, urlSplit[urlSplit.length - 1])];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        entityWithValidations_1.testConfiguration.restDbRunningOnServer = false;
+                        return [7 /*endfinally*/];
+                    case 4: return [2 /*return*/, result];
+                }
+            });
+        }); },
+        get: function (url) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var r, result;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        r = new TestDataApiResponse_1.TestDataApiResponse();
+                        r.success = function (data) { result = data; };
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, , 3, 4]);
+                        entityWithValidations_1.testConfiguration.restDbRunningOnServer = true;
+                        return [4 /*yield*/, dataApi.httpGet(r, urlToReq(url), function () { return ""; })];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        entityWithValidations_1.testConfiguration.restDbRunningOnServer = false;
+                        return [7 /*endfinally*/];
+                    case 4: return [2 /*return*/, result];
+                }
+            });
+        }); },
+        post: function (url, data) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var r, result;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        r = new TestDataApiResponse_1.TestDataApiResponse();
+                        r.created = function (data) { result = data; };
+                        r.success = function (data) { result = data; };
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, , 3, 4]);
+                        entityWithValidations_1.testConfiguration.restDbRunningOnServer = true;
+                        return [4 /*yield*/, dataApi.httpPost(r, urlToReq(url), data, function () { return ({}); })];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        entityWithValidations_1.testConfiguration.restDbRunningOnServer = false;
+                        return [7 /*endfinally*/];
+                    case 4: return [2 /*return*/, result];
+                }
+            });
+        }); },
+        put: function (url, data) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var urlSplit, r, result;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        urlSplit = url.split('/');
+                        r = new TestDataApiResponse_1.TestDataApiResponse();
+                        r.success = function (data) { result = data; };
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, , 3, 4]);
+                        entityWithValidations_1.testConfiguration.restDbRunningOnServer = true;
+                        return [4 /*yield*/, dataApi.put(r, urlSplit[urlSplit.length - 1], data)];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        entityWithValidations_1.testConfiguration.restDbRunningOnServer = false;
+                        return [7 /*endfinally*/];
+                    case 4: return [2 /*return*/, result];
+                }
+            });
+        }); }
+    });
+}
+exports.createMockHttpDataProvider = createMockHttpDataProvider;

package/src/valueConverters.js

@@ -8,6 +8,8 @@ var ValueConverters = /** @class */ (function () {
     }
     ValueConverters.Date = {
         toJson: function (val) {
+            if (val === null)
+                return null;
             if (!val)
                 return '';
             if (typeof (val) === "string")
@@ -16,11 +18,12 @@ var ValueConverters = /** @class */ (function () {
                 return val.toISOString();
             }
             else {
-                console.log("ToJsonError", val);
-                throw new Error("Expected date but got val");
+                throw new Error("Expected date but got " + val);
             }
         },
         fromJson: function (val) {
+            if (val === null)
+                return null;
             if (val == undefined)
                 return undefined;
             if (val == '')
@@ -30,7 +33,15 @@ var ValueConverters = /** @class */ (function () {
             return new Date(Date.parse(val));
         },
         toDb: function (x) { return x; },
-        fromDb: function (x) { return x; },
+        fromDb: function (val) {
+            if (typeof val === "number")
+                val = new Date(val);
+            if (typeof (val) === "string")
+                val = new Date(val);
+            if (val && !(val instanceof Date))
+                throw "expected date but got " + val;
+            return val;
+        },
         fromInput: function (x) { return ValueConverters.Date.fromJson(x); },
         toInput: function (x) { return ValueConverters.Date.toJson(x); },
         displayValue: function (val) {
@@ -68,10 +79,7 @@ var ValueConverters = /** @class */ (function () {
         } //when using date storage,  the database expects and returns a date local and every where else we reflect on date iso
         ,
         fromDb: function (val) {
-            var d = val;
-            if (!d)
-                return null;
-            return val;
+            return ValueConverters.Date.fromDb(val);
         },
         fieldTypeInDb: 'date',
         displayValue: function (value) {