@sumaris-net/ngx-components 18.22.3 → 18.22.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.
Files changed (6) hide show
  1. package/esm2022/src/app/core/services/model/filter.model.mjs +37 -24
  2. package/fesm2022/sumaris-net.ngx-components.mjs +36 -23
  3. package/fesm2022/sumaris-net.ngx-components.mjs.map +1 -1
  4. package/package.json +1 -1
  5. package/src/app/core/services/model/filter.model.d.ts +6 -4
  6. package/src/assets/manifest.json +1 -1
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@sumaris-net/ngx-components",
3
3
  "description": "SUMARiS Angular components",
4
- "version": "18.22.3",
4
+ "version": "18.22.4",
5
5
  "author": "contact@e-is.pro",
6
6
  "license": "AGPL-3.0",
7
7
  "readmeFilename": "README.md",
package/src/app/core/services/model/filter.model.d.ts CHANGED
@@ -5,16 +5,18 @@ export interface IEntityFilter<F extends IEntityFilter<F, T, ID, AO, FO>, T exte
5
5
  asFilterFn(): FilterFn<T>;
6
6
  isEmpty(): boolean;
7
7
  countNotEmptyCriteria(): number;
8
+ not?: F;
8
9
  and?: F[];
9
10
  or?: F[];
10
- not?: F;
11
11
  }
12
12
  export declare abstract class EntityFilter<F extends IEntityFilter<F, T, ID, AO, FO>, T extends IEntity<T, any>, ID = number, AO extends EntityAsObjectOptions = EntityAsObjectOptions, FO = any> extends Entity<F, ID, AO, FO> implements IEntityFilter<F, T, ID, AO, FO> {
13
+ not?: F;
13
14
  and?: F[];
14
15
  or?: F[];
15
- not?: F;
16
- static composeAnd<T extends IEntity<T, any>>(filterFns: FilterFn<T>[]): FilterFn<T>;
17
- static composeOr<T extends IEntity<T, any>>(filterFns: FilterFn<T>[]): FilterFn<T>;
16
+ static composeAnd<F extends IEntityFilter<F, T, ID>, T extends IEntity<T, any>, ID = number>(...filters: F[]): FilterFn<T>;
17
+ static composeOr<F extends IEntityFilter<F, T, ID>, T extends IEntity<T, any>, ID = number>(...filters: F[]): FilterFn<T>;
18
+ static composeAndFns<T extends IEntity<T, any>>(...filterFns: FilterFn<T>[]): FilterFn<T>;
19
+ static composeOrFns<T extends IEntity<T, any>>(...filterFns: FilterFn<T>[]): FilterFn<T>;
18
20
  constructor(__typename?: string);
19
21
  create(): F;
20
22
  /**
package/src/assets/manifest.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "ngx-sumaris-components",
3
3
  "short_name": "ngx-sumaris-components",
4
4
  "manifest_version": 1,
5
- "version": "18.22.3",
5
+ "version": "18.22.4",
6
6
  "default_locale": "fr",
7
7
  "description": "Angular components for building beautiful and responsive Apps",
8
8
  "icons": [{