@sumaris-net/ngx-components 18.20.1 → 18.21.1

package/package.json

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

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

@@ -1,16 +1,17 @@
 import { Observable } from 'rxjs';
-import { InternalRefetchQueriesInclude, MutationUpdaterFn, WatchQueryFetchPolicy } from '@apollo/client/core';
+import { InternalRefetchQueriesInclude, WatchQueryFetchPolicy } from '@apollo/client/core';
 import { SortDirection } from '@angular/material/sort';
 import { BaseGraphqlService } from './base-graphql-service.class';
-import { EntitiesServiceLoadOptions, EntitiesServiceWatchOptions, EntityServiceListenChangesOptions, EntityServiceSaveOptions, IEntitiesService, IEntityService, LoadResult } from '../../shared/services/entity-service.class';
+import { EntitiesServiceDeleteOptions, EntitiesServiceLoadOptions, EntitiesServiceWatchOptions, EntityServiceListenChangesOptions, EntityServiceSaveOptions, 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';
 import { FetchResult } from '@apollo/client/link/core';
 import { EntityFilter } from './model/filter.model';
 import { DocumentNode } from 'graphql';
+import type { Unmasked } from '@apollo/client/masking';
 import * as i0 from "@angular/core";
-export type MutableWatchQueriesUpdatePolicy = 'update-cache' | 'refetch-queries';
+export type MutableWatchQueriesUpdatePolicy = 'update-cache' | 'refetch-queries' | 'none';
 /**
  * @deprecated Use EntityServiceSaveOptions
  */
@@ -48,8 +49,15 @@ export interface BaseEntityServiceOptions<T extends Entity<any, ID>, ID = number
     defaultSortBy?: keyof T;
     defaultSortDirection?: SortDirection;
     watchQueriesUpdatePolicy?: MutableWatchQueriesUpdatePolicy;
+    watchQueriesDeletePolicy?: MutableWatchQueriesUpdatePolicy;
 }
-export declare abstract class BaseEntityService<T extends Entity<T, ID>, F extends EntityFilter<F, T, ID>, ID = number, WO extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions<T>, LO extends EntitiesServiceLoadOptions = EntitiesServiceLoadOptions<T>, 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 interface EntityServiceRefetchQueriesOptions<T = any> {
+    refetchQueries?: ((result: FetchResult<Unmasked<{
+        data: T[];
+    }>>) => InternalRefetchQueriesInclude) | InternalRefetchQueriesInclude;
+    policy?: MutableWatchQueriesUpdatePolicy;
+}
+export declare abstract class BaseEntityService<T extends Entity<T, ID>, F extends EntityFilter<F, T, ID>, ID = number, WO extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions<T>, LO extends EntitiesServiceLoadOptions = EntitiesServiceLoadOptions<T>, DO extends EntitiesServiceDeleteOptions = EntitiesServiceDeleteOptions<T>, 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;
@@ -64,6 +72,7 @@ export declare abstract class BaseEntityService<T extends Entity<T, ID>, F exten
     protected readonly defaultSortBy: keyof T;
     protected readonly defaultSortDirection: SortDirection;
     protected readonly watchQueriesUpdatePolicy: MutableWatchQueriesUpdatePolicy;
+    protected readonly watchQueriesDeletePolicy: MutableWatchQueriesUpdatePolicy;
     get defaultFetchPolicy(): WatchQueryFetchPolicy;
     protected constructor(graphql: GraphqlService, platform: PlatformService, dataType: new () => T, filterType: new () => F, options: BaseEntityServiceOptions<T, ID, Q, M, S>);
     watch(id: number, opts?: WO): Observable<T>;
@@ -85,13 +94,11 @@ export declare abstract class BaseEntityService<T extends Entity<T, ID>, F exten
     /**
      * Delete referential entities
      */
-    deleteAll(entities: T[], opts?: Partial<{
-        update: MutationUpdaterFn<any>;
-    }> | any): Promise<any>;
+    deleteAll(entities: T[], opts?: DO | any): Promise<any>;
     /**
      * Delete a referential entity
      */
-    delete(entity: T, opts?: EntityServiceSaveOptions | any): Promise<any>;
+    delete(entity: T, opts?: DO | any): Promise<any>;
     listenChanges(id: ID, opts?: EntityServiceListenChangesOptions<T>): Observable<T>;
     copyIdAndUpdateDate(source: T, target: T): void;
     fromObject(source: any, opts?: {
@@ -117,11 +124,11 @@ export declare abstract class BaseEntityService<T extends Entity<T, ID>, F exten
         [key: string]: any;
     }): T[];
     protected asObject(source: T, opts?: EntityAsObjectOptions): any;
-    protected getRefetchQueriesForMutation(opts?: EntityServiceSaveOptions): ((result: FetchResult<{
-        data: any;
-    }>) => InternalRefetchQueriesInclude) | InternalRefetchQueriesInclude;
+    protected getRefetchQueriesForMutation(opts?: EntityServiceRefetchQueriesOptions<T>): ((result: FetchResult<Unmasked<{
+        data: T[];
+    }>>) => InternalRefetchQueriesInclude) | InternalRefetchQueriesInclude;
     protected getLoadQueries(): DocumentNode[];
     protected getLoadQueryNames(): string[];
-    static ɵfac: i0.ɵɵFactoryDeclaration<BaseEntityService<any, any, any, any, any, any, any, any>, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<BaseEntityService<any, any, any, any, any, any, any, any>, never, never, {}, {}, never, never, false, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<BaseEntityService<any, any, any, any, any, any, any, any, any>, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<BaseEntityService<any, any, any, any, any, any, any, any, any>, never, never, {}, {}, never, never, false, never>;
 }

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

@@ -1,8 +1,8 @@
 import { Observable } from 'rxjs';
-import { ApolloCache, FetchPolicy, InternalRefetchQueriesInclude, MutationUpdaterFn, MutationUpdaterFunction, WatchQueryFetchPolicy } from '@apollo/client/core';
+import { ApolloCache, FetchPolicy, MutationUpdaterFn, MutationUpdaterFunction, WatchQueryFetchPolicy } from '@apollo/client/core';
 import { SortDirection } from '@angular/material/sort';
 import { EmptyObject } from '../../core/graphql/graphql.utils';
-import { FetchResult } from '@apollo/client/link/core';
+import { MutationBaseOptions } from '@apollo/client/core/watchQueryOptions';
 export declare interface Page {
     offset: number;
     size: number;
@@ -25,37 +25,34 @@ export type SuggestFn<T, F> = (value: any, filter?: F, sortBy?: string | keyof T
 export declare interface SuggestService<T, F> {
     suggest: SuggestFn<T, F>;
 }
-export declare interface EntityServiceLoadOptions<E = any> {
+export declare interface EntityServiceLoadOptions<T = any, V = any> {
     fetchPolicy?: FetchPolicy;
     trash?: boolean;
-    toEntity?: boolean | ((source: any, opts?: any) => E);
+    toEntity?: boolean | ((source: any, opts?: any) => T);
     query?: any;
-    variables?: any;
-    [key: string]: any;
-}
-export declare interface EntityServiceDeleteOptions<E = any> {
+    variables?: V;
     [key: string]: any;
 }
-export declare interface EntityServiceWatchOptions<T = any> {
+export declare interface EntityServiceWatchOptions<T = any, V = any> {
+    query?: any;
+    variables?: V;
     fetchPolicy?: WatchQueryFetchPolicy;
     trash?: boolean;
     toEntity?: boolean | ((source: any, opts?: any) => T);
-    query?: any;
-    variables?: any;
     [key: string]: any;
 }
-export declare interface EntityServiceListenChangesOptions<T = any> {
+export declare interface EntityServiceListenChangesOptions<T = any, V = any> {
+    query?: any;
+    variables?: V;
     interval?: number;
     fetchPolicy?: FetchPolicy;
-    toEntity?: boolean | ((source: any) => T);
-    query?: any;
-    variables?: any;
+    toEntity?: boolean | ((source: any, opts?: any) => T);
     [key: string]: any;
 }
 export interface EntityServiceSaveOptions<T = any, V = any> {
-    refetchQueries?: ((result: FetchResult<{
-        data: T;
-    }>) => InternalRefetchQueriesInclude) | InternalRefetchQueriesInclude;
+    query?: any;
+    variables?: V;
+    refetchQueries?: MutationBaseOptions<T>['refetchQueries'];
     awaitRefetchQueries?: boolean;
     update?: MutationUpdaterFn<{
         data: any;
@@ -64,6 +61,10 @@ export interface EntityServiceSaveOptions<T = any, V = any> {
     }, V, any, ApolloCache<{
         data: any;
     }>>;
+    [key: string]: any;
+}
+export declare interface EntityServiceDeleteOptions<T = any, V = any> extends Omit<EntityServiceSaveOptions<T, V>, 'query'> {
+    mutation?: any;
 }
 export declare interface IEntityService<T, ID = any, LO = EntityServiceLoadOptions<T>, SO = EntityServiceSaveOptions<T>, DO = EntityServiceDeleteOptions<T>> {
     load(id: ID, opts?: LO): Promise<T>;
@@ -72,15 +73,15 @@ export declare interface IEntityService<T, ID = any, LO = EntityServiceLoadOptio
     delete(data: T, opts?: DO): Promise<any>;
     listenChanges(id: ID, opts?: any): Observable<T | undefined>;
 }
-export declare interface EntitiesServiceLoadOptions<T = any> extends EntityServiceLoadOptions<T> {
+export declare interface EntitiesServiceLoadOptions<T = any, V = any> extends EntityServiceLoadOptions<T, V> {
     withTotal?: boolean;
 }
-export declare interface EntitiesServiceWatchOptions<T = any> extends EntityServiceWatchOptions<T> {
+export declare interface EntitiesServiceWatchOptions<T = any, V = any> extends EntityServiceWatchOptions<T, V> {
     withTotal?: boolean;
 }
-export declare interface EntitiesServiceSaveOptions<T = any> extends EntityServiceSaveOptions<T> {
+export declare interface EntitiesServiceSaveOptions<T = any, V = any> extends EntityServiceSaveOptions<T, V> {
 }
-export declare interface EntitiesServiceDeleteOptions<T = any> extends EntityServiceDeleteOptions<T> {
+export declare interface EntitiesServiceDeleteOptions<T = any, V = any> extends EntityServiceDeleteOptions<T, V> {
 }
 export declare interface IEntitiesService<T, F, O extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions<T>, SO extends EntitiesServiceSaveOptions = EntitiesServiceSaveOptions<T>, DO extends EntitiesServiceDeleteOptions = EntitiesServiceDeleteOptions<T>> {
     readonly defaultFetchPolicy?: WatchQueryFetchPolicy;

package/src/assets/manifest.json

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