@sumaris-net/ngx-components 18.22.1 → 18.22.3

package/package.json

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

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

@@ -5,17 +5,18 @@ export interface IEntityFilter<F extends IEntityFilter<F, T, ID, AO, FO>, T exte
     asFilterFn(): FilterFn<T>;
     isEmpty(): boolean;
     countNotEmptyCriteria(): number;
-    and(...filters: F[]): F;
-    or(...filters: F[]): F;
-    not(): F;
+    and?: F[];
+    or?: F[];
+    not?: F;
 }
 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> {
-    protected __and?: F[];
-    protected __or?: F[];
-    protected __not?: boolean;
-    static andFns<T extends IEntity<T, any>>(filterFns: FilterFn<T>[]): FilterFn<T>;
-    static orFns<T extends IEntity<T, any>>(filterFns: FilterFn<T>[]): FilterFn<T>;
+    and?: F[];
+    or?: F[];
+    not?: F;
+    static composeAnd<T extends IEntity<T, any>>(filterFns: FilterFn<T>[]): FilterFn<T>;
+    static composeOr<T extends IEntity<T, any>>(filterFns: FilterFn<T>[]): FilterFn<T>;
     constructor(__typename?: string);
+    create(): F;
     /**
      * Clean a filter, before sending to the pod (e.g convert dates, remove internal properties, etc.)
      */
@@ -23,30 +24,11 @@ export declare abstract class EntityFilter<F extends IEntityFilter<F, T, ID, AO,
     isEmpty(): boolean;
     countNotEmptyCriteria(): number;
     asFilterFn(): FilterFn<T>;
-    and(...filters: F[]): F;
-    or(...filters: F[]): F;
-    not(): F;
     asObject(opts?: AO): any;
     fromObject(source: any, opts?: FO): void;
     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.22.1",
+  "version": "18.22.3",
   "default_locale": "fr",
   "description": "Angular components for building beautiful and responsive Apps",
   "icons": [{