remult 0.10.14 → 0.11.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6,6 +6,7 @@ var sql_database_1 = require("../data-providers/sql-database");
6
6
  var remult3_1 = require("../remult3");
7
7
  var filter_interfaces_1 = require("../filter/filter-interfaces");
8
8
  var array_entity_data_provider_1 = require("../data-providers/array-entity-data-provider");
9
+ var filter_consumer_bridge_to_sql_request_1 = require("../filter/filter-consumer-bridge-to-sql-request");
9
10
  var entityForCustomFilter = /** @class */ (function (_super) {
10
11
  tslib_1.__extends(entityForCustomFilter, _super);
11
12
  function entityForCustomFilter() {
@@ -14,30 +15,31 @@ var entityForCustomFilter = /** @class */ (function (_super) {
14
15
  entityForCustomFilter_1 = entityForCustomFilter;
15
16
  var entityForCustomFilter_1;
16
17
  entityForCustomFilter.filter = filter_interfaces_1.Filter.createCustom(function (remult, c) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
17
- var r, e_1;
18
+ var r, meta_1, e_1;
18
19
  return tslib_1.__generator(this, function (_a) {
19
- r = [];
20
- if (c.oneAndThree)
21
- r.push({ id: [1, 3] });
22
- if (c.two)
23
- r.push({ id: 2 });
24
- if (c.dbOneOrThree) {
25
- e_1 = remult.repo(entityForCustomFilter_1).metadata;
26
- r.push({
27
- $and: [
28
- 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) {
29
- switch (_b.label) {
30
- case 0:
31
- _a = x;
32
- return [4 /*yield*/, e_1.fields.id.getDbName()];
33
- case 1: return [2 /*return*/, _a.sql = (_b.sent()) + ' in (' + x.addParameterAndReturnSqlToken(1) + "," + x.addParameterAndReturnSqlToken(3) + ")"];
34
- }
35
- }); }); }),
36
- array_entity_data_provider_1.ArrayEntityDataProvider.customFilter(function (x) { return x.id == 1 || x.id == 3; })
37
- ]
38
- });
20
+ switch (_a.label) {
21
+ case 0:
22
+ r = [];
23
+ if (c.oneAndThree)
24
+ r.push({ id: [1, 3] });
25
+ if (c.two)
26
+ r.push({ id: 2 });
27
+ if (!c.dbOneOrThree) return [3 /*break*/, 2];
28
+ meta_1 = remult.repo(entityForCustomFilter_1).metadata;
29
+ return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.getDbNameProvider(meta_1)];
30
+ case 1:
31
+ e_1 = _a.sent();
32
+ r.push({
33
+ $and: [
34
+ 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) {
35
+ return [2 /*return*/, x.sql = e_1.nameOf(meta_1.fields.id) + ' in (' + x.addParameterAndReturnSqlToken(1) + "," + x.addParameterAndReturnSqlToken(3) + ")"];
36
+ }); }); }),
37
+ array_entity_data_provider_1.ArrayEntityDataProvider.customFilter(function (x) { return x.id == 1 || x.id == 3; })
38
+ ]
39
+ });
40
+ _a.label = 2;
41
+ case 2: return [2 /*return*/, { $and: r }];
39
42
  }
40
- return [2 /*return*/, { $and: r }];
41
43
  });
42
44
  }); });
43
45
  entityForCustomFilter.oneAndThree = filter_interfaces_1.Filter.createCustom(function () { return ({ id: [1, 3] }); });
@@ -42,7 +42,7 @@ exports.DateOnlyValueConverter = {
42
42
  toInput: function (x) { return exports.DateOnlyValueConverter.toJson(x); },
43
43
  toJson: function (val) {
44
44
  var d = val;
45
- if (typeof d === "string")
45
+ if (typeof d === "string" || typeof (d) === "number")
46
46
  d = new Date(d);
47
47
  if (!d || d == null)
48
48
  return null;