remult 0.16.3-exp.2 → 0.16.3-exp.3

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.
Files changed (7) hide show
  1. package/esm/src/filter/filter-interfaces.d.ts +3 -3
  2. package/esm/src/filter/filter-interfaces.js +1 -1
  3. package/esm/src/tests/entityForCustomFilter.js +3 -3
  4. package/package.json +1 -1
  5. package/src/filter/filter-interfaces.d.ts +3 -3
  6. package/src/filter/filter-interfaces.js +1 -1
  7. package/src/tests/entityForCustomFilter.js +3 -3
package/esm/src/filter/filter-interfaces.d.ts CHANGED
@@ -6,8 +6,8 @@ export declare class Filter {
6
6
  constructor(apply?: (add: FilterConsumer) => void);
7
7
  __applyToConsumer(add: FilterConsumer): void;
8
8
  static resolve<entityType>(filter: EntityFilter<entityType> | (() => EntityFilter<entityType> | Promise<EntityFilter<entityType>>)): Promise<EntityFilter<entityType>>;
9
- static createCustom<entityType>(customFilterTranslator: (r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): (() => EntityFilter<entityType>) & customFilterInfo<entityType>;
10
- static createCustom<entityType, argsType>(customFilterTranslator: (r: Remult, args: argsType) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): ((y: argsType) => EntityFilter<entityType>) & customFilterInfo<entityType>;
9
+ static createCustom<entityType>(customFilterTranslator: (unused: any, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): (() => EntityFilter<entityType>) & customFilterInfo<entityType>;
10
+ static createCustom<entityType, argsType>(customFilterTranslator: (args: argsType, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): ((y: argsType) => EntityFilter<entityType>) & customFilterInfo<entityType>;
11
11
  static fromEntityFilter<T>(entity: EntityMetadata<T>, whereItem: EntityFilter<T>): Filter;
12
12
  toJson(): any;
13
13
  static entityFilterToJson<T>(entityDefs: EntityMetadata<T>, where: EntityFilter<T>): any;
@@ -80,6 +80,6 @@ export declare function buildFilterFromRequestParameters(entity: EntityMetadata,
80
80
  export interface customFilterInfo<entityType> {
81
81
  customFilterInfo: {
82
82
  key: string;
83
- customFilterTranslator: (r: Remult, args: any) => (EntityFilter<entityType> | Promise<EntityFilter<entityType>>);
83
+ customFilterTranslator: (args: any, r: Remult) => (EntityFilter<entityType> | Promise<EntityFilter<entityType>>);
84
84
  };
85
85
  }
package/esm/src/filter/filter-interfaces.js CHANGED
@@ -125,7 +125,7 @@ export class Filter {
125
125
  const element = entity.entityType[key];
126
126
  if (element && element.customFilterInfo && element.customFilterInfo.customFilterTranslator) {
127
127
  if (element.customFilterInfo.key == filterKey) {
128
- r.push(await Filter.fromEntityFilter(entity, await element.customFilterInfo.customFilterTranslator(remult, custom)));
128
+ r.push(await Filter.fromEntityFilter(entity, await element.customFilterInfo.customFilterTranslator(custom, remult)));
129
129
  }
130
130
  }
131
131
  }
package/esm/src/tests/entityForCustomFilter.js CHANGED
@@ -7,7 +7,7 @@ import { ArrayEntityDataProvider } from '../data-providers/array-entity-data-pro
7
7
  import { dbNamesOf } from '../filter/filter-consumer-bridge-to-sql-request';
8
8
  let entityForCustomFilter = entityForCustomFilter_1 = class entityForCustomFilter extends EntityBase {
9
9
  };
10
- entityForCustomFilter.filter = Filter.createCustom(async (remult, c) => {
10
+ entityForCustomFilter.filter = Filter.createCustom(async (c, remult) => {
11
11
  let r = [];
12
12
  if (c.oneAndThree)
13
13
  r.push({ id: [1, 3] });
@@ -25,8 +25,8 @@ entityForCustomFilter.filter = Filter.createCustom(async (remult, c) => {
25
25
  return { $and: r };
26
26
  });
27
27
  entityForCustomFilter.oneAndThree = Filter.createCustom(() => ({ id: [1, 3] }));
28
- entityForCustomFilter.testNumericValue = Filter.createCustom((r, val) => ({ id: val }));
29
- entityForCustomFilter.testObjectValue = Filter.createCustom((r, val) => ({ id: val.val }));
28
+ entityForCustomFilter.testNumericValue = Filter.createCustom((val) => ({ id: val }));
29
+ entityForCustomFilter.testObjectValue = Filter.createCustom((val) => ({ id: val.val }));
30
30
  __decorate([
31
31
  Fields.integer(),
32
32
  __metadata("design:type", Number)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "remult",
3
- "version": "0.16.3-exp.2",
3
+ "version": "0.16.3-exp.3",
4
4
  "description": "A CRUD framework for full-stack TypeScript",
5
5
  "main": "index.js",
6
6
  "types": "index.d.ts",
package/src/filter/filter-interfaces.d.ts CHANGED
@@ -6,8 +6,8 @@ export declare class Filter {
6
6
  constructor(apply?: (add: FilterConsumer) => void);
7
7
  __applyToConsumer(add: FilterConsumer): void;
8
8
  static resolve<entityType>(filter: EntityFilter<entityType> | (() => EntityFilter<entityType> | Promise<EntityFilter<entityType>>)): Promise<EntityFilter<entityType>>;
9
- static createCustom<entityType>(customFilterTranslator: (r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): (() => EntityFilter<entityType>) & customFilterInfo<entityType>;
10
- static createCustom<entityType, argsType>(customFilterTranslator: (r: Remult, args: argsType) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): ((y: argsType) => EntityFilter<entityType>) & customFilterInfo<entityType>;
9
+ static createCustom<entityType>(customFilterTranslator: (unused: any, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): (() => EntityFilter<entityType>) & customFilterInfo<entityType>;
10
+ static createCustom<entityType, argsType>(customFilterTranslator: (args: argsType, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): ((y: argsType) => EntityFilter<entityType>) & customFilterInfo<entityType>;
11
11
  static fromEntityFilter<T>(entity: EntityMetadata<T>, whereItem: EntityFilter<T>): Filter;
12
12
  toJson(): any;
13
13
  static entityFilterToJson<T>(entityDefs: EntityMetadata<T>, where: EntityFilter<T>): any;
@@ -80,6 +80,6 @@ export declare function buildFilterFromRequestParameters(entity: EntityMetadata,
80
80
  export interface customFilterInfo<entityType> {
81
81
  customFilterInfo: {
82
82
  key: string;
83
- customFilterTranslator: (r: Remult, args: any) => (EntityFilter<entityType> | Promise<EntityFilter<entityType>>);
83
+ customFilterTranslator: (args: any, r: Remult) => (EntityFilter<entityType> | Promise<EntityFilter<entityType>>);
84
84
  };
85
85
  }
package/src/filter/filter-interfaces.js CHANGED
@@ -162,7 +162,7 @@ var Filter = /** @class */ (function () {
162
162
  _d = (_c = r).push;
163
163
  _f = (_e = Filter).fromEntityFilter;
164
164
  _g = [entity];
165
- return [4 /*yield*/, element.customFilterInfo.customFilterTranslator(remult, custom)];
165
+ return [4 /*yield*/, element.customFilterInfo.customFilterTranslator(custom, remult)];
166
166
  case 2: return [4 /*yield*/, _f.apply(_e, _g.concat([_h.sent()]))];
167
167
  case 3:
168
168
  _d.apply(_c, [_h.sent()]);
package/src/tests/entityForCustomFilter.js CHANGED
@@ -14,7 +14,7 @@ var entityForCustomFilter = /** @class */ (function (_super) {
14
14
  }
15
15
  entityForCustomFilter_1 = entityForCustomFilter;
16
16
  var entityForCustomFilter_1;
17
- entityForCustomFilter.filter = filter_interfaces_1.Filter.createCustom(function (remult, c) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
17
+ entityForCustomFilter.filter = filter_interfaces_1.Filter.createCustom(function (c, remult) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
18
18
  var r, e_1;
19
19
  return tslib_1.__generator(this, function (_a) {
20
20
  switch (_a.label) {
@@ -42,8 +42,8 @@ var entityForCustomFilter = /** @class */ (function (_super) {
42
42
  });
43
43
  }); });
44
44
  entityForCustomFilter.oneAndThree = filter_interfaces_1.Filter.createCustom(function () { return ({ id: [1, 3] }); });
45
- entityForCustomFilter.testNumericValue = filter_interfaces_1.Filter.createCustom(function (r, val) { return ({ id: val }); });
46
- entityForCustomFilter.testObjectValue = filter_interfaces_1.Filter.createCustom(function (r, val) { return ({ id: val.val }); });
45
+ entityForCustomFilter.testNumericValue = filter_interfaces_1.Filter.createCustom(function (val) { return ({ id: val }); });
46
+ entityForCustomFilter.testObjectValue = filter_interfaces_1.Filter.createCustom(function (val) { return ({ id: val.val }); });
47
47
  tslib_1.__decorate([
48
48
  remult3_1.Fields.integer(),
49
49
  tslib_1.__metadata("design:type", Number)