@sumaris-net/ngx-components 2.2.1-rc8 → 2.2.1-rc9

package/package.json

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

package/src/app/core/services/base-entity-service.class.d.ts

@@ -1,8 +1,8 @@
 import { Observable } from 'rxjs';
-import { FetchPolicy, InternalRefetchQueriesInclude, MutationUpdaterFn } from '@apollo/client/core';
+import { InternalRefetchQueriesInclude, MutationUpdaterFn } from '@apollo/client/core';
 import { SortDirection } from '@angular/material/sort';
 import { BaseGraphqlService } from './base-graphql-service.class';
-import { EntitiesServiceWatchOptions, EntityServiceLoadOptions, IEntitiesService, IEntityService, LoadResult } from '../../shared/services/entity-service.class';
+import { EntitiesServiceLoadOptions, EntitiesServiceWatchOptions, EntityServiceListenChangesOptions, IEntitiesService, IEntityService, LoadResult } from '../../shared/services/entity-service.class';
 import { GraphqlService } from '../graphql/graphql.service';
 import { PlatformService } from './platform.service';
 import { Entity, EntityAsObjectOptions } from './model/entity.model';
@@ -45,7 +45,7 @@ export interface EntitySaveOptions {
         data: any;
     }>;
 }
-export declare abstract class BaseEntityService<T extends Entity<T, ID>, F extends EntityFilter<F, T, ID>, ID = number, WO extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions, LO extends EntityServiceLoadOptions = EntityServiceLoadOptions, Q extends BaseEntityGraphqlQueries = BaseEntityGraphqlQueries, M extends BaseEntityGraphqlMutations = BaseEntityGraphqlMutations, S extends BaseEntityGraphqlSubscriptions = BaseEntityGraphqlSubscriptions> extends BaseGraphqlService<T, F, ID> implements IEntitiesService<T, F, WO>, IEntityService<T, ID, LO> {
+export declare abstract class BaseEntityService<T extends Entity<T, ID>, F extends EntityFilter<F, T, ID>, ID = number, WO extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions, LO extends EntitiesServiceLoadOptions = EntitiesServiceLoadOptions, Q extends BaseEntityGraphqlQueries = BaseEntityGraphqlQueries, M extends BaseEntityGraphqlMutations = BaseEntityGraphqlMutations, S extends BaseEntityGraphqlSubscriptions = BaseEntityGraphqlSubscriptions> extends BaseGraphqlService<T, F, ID> implements IEntitiesService<T, F, WO>, IEntityService<T, ID, LO> {
     protected graphql: GraphqlService;
     protected platform: PlatformService;
     protected dataType: new () => T;
@@ -61,19 +61,11 @@ export declare abstract class BaseEntityService<T extends Entity<T, ID>, F exten
     protected readonly defaultSortDirection: SortDirection;
     protected readonly watchQueriesUpdatePolicy: MutableWatchQueriesUpdatePolicy;
     protected constructor(graphql: GraphqlService, platform: PlatformService, dataType: new () => T, filterType: new () => F, options: BaseEntityServiceOptions<T, ID, Q, M, S>);
-    watch(id: number, opts?: WO & {
-        query?: any;
-    }): Observable<T>;
-    load(id: ID, opts?: LO & {
-        query?: any;
-    }): Promise<T>;
-    watchAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: F, opts?: WO & {
-        query?: any;
-    }): Observable<LoadResult<T>>;
+    watch(id: number, opts?: WO): Observable<T>;
+    load(id: ID, opts?: LO): Promise<T>;
+    watchAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: F, opts?: WO): Observable<LoadResult<T>>;
     loadAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<F>, opts?: LO & {
-        query?: any;
         debug?: boolean;
-        withTotal?: boolean;
     }): Promise<LoadResult<T>>;
     countAll(filter?: Partial<F>, opts?: LO): Promise<number>;
     canUserWrite(data: T, opts?: any): boolean;
@@ -95,13 +87,7 @@ export declare abstract class BaseEntityService<T extends Entity<T, ID>, F exten
      * Delete a referential entity
      */
     delete(entity: T, opts?: EntitySaveOptions | any): Promise<any>;
-    listenChanges(id: ID, opts?: {
-        query?: any;
-        variables?: any;
-        interval?: number;
-        fetchPolicy?: FetchPolicy;
-        toEntity?: boolean;
-    }): Observable<T>;
+    listenChanges(id: ID, opts?: EntityServiceListenChangesOptions): Observable<T>;
     copyIdAndUpdateDate(source: T, target: T): void;
     fromObject(source: any): T;
     asFilter(source: any): F;

package/src/app/shared/services/entity-service.class.d.ts

@@ -28,6 +28,24 @@ export declare interface EntityServiceLoadOptions {
     fetchPolicy?: FetchPolicy;
     trash?: boolean;
     toEntity?: boolean;
+    query?: any;
+    variables?: any;
+    [key: string]: any;
+}
+export declare interface EntityServiceWatchOptions {
+    fetchPolicy?: WatchQueryFetchPolicy;
+    trash?: boolean;
+    toEntity?: boolean;
+    query?: any;
+    variables?: any;
+    [key: string]: any;
+}
+export declare interface EntityServiceListenChangesOptions {
+    interval?: number;
+    fetchPolicy?: FetchPolicy;
+    toEntity?: boolean;
+    query?: any;
+    variables?: any;
     [key: string]: any;
 }
 export declare interface IEntityService<T, ID = any, LO = EntityServiceLoadOptions> {
@@ -37,19 +55,11 @@ export declare interface IEntityService<T, ID = any, LO = EntityServiceLoadOptio
     delete(data: T, opts?: any): Promise<any>;
     listenChanges(id: ID, opts?: any): Observable<T | undefined>;
 }
-export declare interface EntitiesServiceLoadOptions {
-    fetchPolicy?: FetchPolicy;
-    trash?: boolean;
+export declare interface EntitiesServiceLoadOptions extends EntityServiceLoadOptions {
     withTotal?: boolean;
-    toEntity?: boolean;
-    [key: string]: any;
 }
-export declare interface EntitiesServiceWatchOptions {
-    fetchPolicy?: WatchQueryFetchPolicy;
-    trash?: boolean;
+export declare interface EntitiesServiceWatchOptions extends EntityServiceWatchOptions {
     withTotal?: boolean;
-    toEntity?: boolean;
-    [key: string]: any;
 }
 export declare interface IEntitiesService<T, F, O extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions> {
     watchAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<F>, options?: O): Observable<LoadResult<T>>;