@sumaris-net/ngx-components 18.21.14 → 18.22.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sumaris-net/ngx-components",
   "description": "SUMARiS Angular components",
-  "version": "18.21.14",
+  "version": "18.22.0",
   "author": "contact@e-is.pro",
   "license": "AGPL-3.0",
   "readmeFilename": "README.md",

package/src/app/admin/users/person.filter.d.ts

@@ -6,7 +6,11 @@ import { FilterFn } from '../../shared/types';
 export declare class PersonFilter extends EntityFilter<PersonFilter, Person> {
     static FIELDS: (keyof PersonFilter)[];
     static fromObject: (source: any, opts?: any) => PersonFilter;
-    static searchFilter(source: any): FilterFn<Person>;
+    static asFilterFn(source: any): FilterFn<Person>;
+    /**
+     * @deprecated Use `PersonFilter.asFilterFn` instead
+     */
+    static searchFilter: typeof PersonFilter.asFilterFn;
     email: string;
     pubkey: string;
     searchText: string;

package/src/app/core/services/model/filter.model.d.ts

@@ -5,21 +5,31 @@ export interface IEntityFilter<F extends IEntityFilter<F, T, ID, AO, FO>, T exte
     asFilterFn(): FilterFn<T>;
     isEmpty(): boolean;
     countNotEmptyCriteria(): number;
+    and(...filters: EntityFilter<any, T>[]): AndFilter<T>;
+    or(...filters: EntityFilter<any, T>[]): OrFilter<T>;
+    not(): NotFilter<T>;
 }
 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> {
     /**
+     * @deprecated Use `EntityFilterUtils.composeFns()`
      * Compose some filter functions: all should return true
      *
      * @param filterFns
      */
     static composeFilters<T extends IEntity<T, any>>(filterFns: FilterFn<T>[]): FilterFn<T>;
-    static compose<F extends EntityFilter<F, T>, T extends IEntity<T, any>>(filters: F[]): FilterFn<T>;
     /**
      * Compose some filter functions: all should return true
      *
      * @param filterFns
      */
     static composeFns<T extends IEntity<T, any>>(filterFns: FilterFn<T>[]): FilterFn<T>;
+    /**
+     * @deprecated Use `EntityFilter.and()`
+     */
+    static compose<F extends EntityFilter<F, T>, T extends IEntity<T, any>>(filters: F[]): FilterFn<T>;
+    static or<T extends IEntity<T, any>>(...filters: EntityFilter<any, T>[]): OrFilter<T>;
+    static and<T extends IEntity<T, any>>(...filters: EntityFilter<any, T>[]): AndFilter<T>;
+    static not<T extends IEntity<T, any>>(filter: EntityFilter<any, T>): NotFilter<T>;
     constructor(__typename?: string);
     /**
      * Clean a filter, before sending to the pod (e.g convert dates, remove internal properties, etc.)
@@ -28,9 +38,28 @@ export declare abstract class EntityFilter<F extends IEntityFilter<F, T, ID, AO,
     isEmpty(): boolean;
     countNotEmptyCriteria(): number;
     asFilterFn(): FilterFn<T>;
+    and(...filters: EntityFilter<any, T>[]): AndFilter<T>;
+    or(...filters: EntityFilter<any, T>[]): OrFilter<T>;
+    not(): NotFilter<T>;
     protected buildFilter(): FilterFn<T>[];
     protected isCriteriaNotEmpty(key: string, value: any): boolean;
 }
+export declare class OrFilter<T extends IEntity<T, any>> extends EntityFilter<OrFilter<T>, T> {
+    protected filters: EntityFilter<any, T>[];
+    constructor(...filters: EntityFilter<any, T>[]);
+    protected buildFilter(): FilterFn<T>[];
+}
+export declare class NotFilter<T extends IEntity<T, any>> extends EntityFilter<NotFilter<T>, T> {
+    protected filter: EntityFilter<any, T>;
+    constructor(filter: EntityFilter<any, T>);
+    protected buildFilter(): FilterFn<T>[];
+}
+export declare class AndFilter<T extends IEntity<T, any>> extends EntityFilter<AndFilter<T>, T> {
+    protected filters: EntityFilter<any, T>[];
+    constructor(...filters: EntityFilter<any, T>[]);
+    and(...filters: EntityFilter<any, T>[]): AndFilter<T>;
+    protected buildFilter(): FilterFn<T>[];
+}
 export declare abstract class EntityFilterUtils {
     static isEntityFilter<F extends EntityFilter<F, any>>(obj: Partial<F>): obj is F;
     static fromObject<F>(source: any, filterType: new () => F): F;

package/src/assets/manifest.json

@@ -2,7 +2,7 @@
   "name": "ngx-sumaris-components",
   "short_name": "ngx-sumaris-components",
   "manifest_version": 1,
-  "version": "18.21.14",
+  "version": "18.22.0",
   "default_locale": "fr",
   "description": "Angular components for building beautiful and responsive Apps",
   "icons": [{