@sumaris-net/ngx-components 18.1.7 → 18.2.1

package/package.json

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

package/src/app/admin/services/person.service.d.ts

@@ -1,11 +1,10 @@
-import { FetchPolicy } from '@apollo/client/core';
 import { BehaviorSubject } from 'rxjs';
 import { GraphqlService } from '../../core/graphql/graphql.service';
 import { NetworkService } from '../../core/services/network.service';
 import { EntitiesStorage } from '../../core/services/storage/entities-storage.service';
 import { Person } from '../../core/services/model/person.model';
 import { SortDirection } from '@angular/material/sort';
-import { EntitiesServiceLoadOptions, LoadResult, SuggestService } from '../../shared/services/entity-service.class';
+import { EntitiesServiceLoadOptions, EntityServiceLoadOptions, LoadResult, SuggestService } from '../../shared/services/entity-service.class';
 import { PlatformService } from '../../core/services/platform.service';
 import { PersonFilter } from './filter/person.filter';
 import { BaseEntityService } from '../../core/services/base-entity-service.class';
@@ -20,31 +19,18 @@ export declare class PersonService extends BaseEntityService<Person, PersonFilte
     protected entities: EntitiesStorage;
     constructor(graphql: GraphqlService, platform: PlatformService, network: NetworkService, entities: EntitiesStorage);
     loadAll(offset: number, size: number, sortBy?: keyof Person | string, sortDirection?: SortDirection, filter?: Partial<PersonFilter>, opts?: EntitiesServiceLoadOptions & {
-        [key: string]: any;
         debug?: boolean;
     }): Promise<LoadResult<Person>>;
-    loadAllLocally(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<PersonFilter>, opts?: {
-        [key: string]: any;
-        fetchPolicy?: FetchPolicy;
+    loadAllLocally(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<PersonFilter>, opts?: EntitiesServiceLoadOptions & {
         debug?: boolean;
-        withTotal?: boolean;
-        toEntity?: boolean;
     }): Promise<LoadResult<Person>>;
     suggest(value: any, filter?: Partial<PersonFilter>, sortBy?: keyof Person | string, sortDirection?: SortDirection, opts?: EntitiesServiceLoadOptions): Promise<LoadResult<Person>>;
     executeImport(filter: Partial<PersonFilter>, opts: {
         progression?: BehaviorSubject<number>;
         maxProgression?: number;
     }): Promise<void>;
-    loadById(id: number, opts?: {
-        [key: string]: any;
-        fetchPolicy?: FetchPolicy;
-        toEntity?: boolean;
-    }): Promise<Person>;
-    loadByPubkey(pubkey: string, opts?: {
-        [key: string]: any;
-        fetchPolicy?: FetchPolicy;
-        toEntity?: boolean;
-    }): Promise<Person>;
+    loadById(id: number, opts?: EntityServiceLoadOptions): Promise<Person>;
+    loadByPubkey(pubkey: string, opts?: EntityServiceLoadOptions): Promise<Person>;
     protected asObject(source: Person | any): any;
     static ɵfac: i0.ɵɵFactoryDeclaration<PersonService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<PersonService>;

package/src/app/core/graphql/graphql.service.d.ts

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
 import { Apollo, ExtraSubscriptionOptions, QueryRef } from 'apollo-angular';
-import { ApolloCache, ApolloClient, FetchPolicy, MutationUpdaterFn, OperationVariables, TypePolicies, WatchQueryFetchPolicy } from '@apollo/client/core';
+import { ApolloCache, ApolloClient, FetchPolicy, MutationUpdaterFn, MutationUpdaterFunction, OperationVariables, TypePolicies, WatchQueryFetchPolicy } from '@apollo/client/core';
 import { ServiceError } from '../services/errors';
 import { InjectionToken } from '@angular/core';
 import { NetworkService } from '../services/network.service';
@@ -23,18 +23,18 @@ export interface WatchQueryOptions<V> {
     error?: ServiceError;
     fetchPolicy?: WatchQueryFetchPolicy;
 }
-export interface MutateQueryOptions<T, V = OperationVariables> extends MutationBaseOptions<T, V> {
+export interface MutateQueryOptions<TData, TVariables = OperationVariables> extends MutationBaseOptions<TData, TVariables> {
     mutation: any;
-    variables?: V;
+    variables?: TVariables;
     error?: ServiceError;
     context?: {
         serializationKey?: string;
         tracked?: boolean;
         timeout?: number;
     };
-    optimisticResponse?: T;
-    offlineResponse?: T | ((context: any) => Promise<T>);
-    update?: MutationUpdaterFn<T>;
+    optimisticResponse?: TData;
+    offlineResponse?: TData | ((context: any) => Promise<TData>);
+    update?: MutationUpdaterFn<TData> | MutationUpdaterFunction<TData, TVariables, any, ApolloCache<TData>>;
     forceOffline?: boolean;
 }
 export declare const APP_GRAPHQL_TYPE_POLICIES: InjectionToken<TypePolicies>;

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

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { InternalRefetchQueriesInclude, MutationUpdaterFn } from '@apollo/client/core';
+import { ApolloCache, InternalRefetchQueriesInclude, MutationUpdaterFn, MutationUpdaterFunction } from '@apollo/client/core';
 import { SortDirection } from '@angular/material/sort';
 import { BaseGraphqlService } from './base-graphql-service.class';
 import { EntitiesServiceLoadOptions, EntitiesServiceWatchOptions, EntityServiceListenChangesOptions, IEntitiesService, IEntityService, LoadResult } from '../../shared/services/entity-service.class';
@@ -44,16 +44,20 @@ export interface BaseEntityServiceOptions<T extends Entity<any, ID>, ID = number
     defaultSortDirection?: SortDirection;
     watchQueriesUpdatePolicy?: MutableWatchQueriesUpdatePolicy;
 }
-export interface EntitySaveOptions {
+export interface EntitySaveOptions<T = any, V = any> {
     refetchQueries?: ((result: FetchResult<{
-        data: any;
+        data: T;
     }>) => InternalRefetchQueriesInclude) | InternalRefetchQueriesInclude;
     awaitRefetchQueries?: boolean;
     update?: MutationUpdaterFn<{
-        data: any;
-    }>;
+        data: T;
+    }> | MutationUpdaterFunction<{
+        data: T;
+    }, V, any, ApolloCache<{
+        data: T;
+    }>>;
 }
-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> {
+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> {
     protected graphql: GraphqlService;
     protected platform: PlatformService;
     protected dataType: new () => T;
@@ -95,9 +99,9 @@ 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?: EntityServiceListenChangesOptions): Observable<T>;
+    listenChanges(id: ID, opts?: EntityServiceListenChangesOptions<T>): Observable<T>;
     copyIdAndUpdateDate(source: T, target: T): void;
-    fromObject(source: any): T;
+    fromObject(source: any, toEntity?: boolean | ((source: any) => T)): T;
     asFilter(source: any): F;
     equals(d1: T, d2: T): boolean;
     isNew(data: T): boolean;
@@ -112,6 +116,7 @@ export declare abstract class BaseEntityService<T extends Entity<T, ID>, F exten
     isNewFn(data: T): boolean;
     protected ngOnStart(): Promise<void>;
     protected fillDefaultProperties(source: T): void;
+    protected fromObjects(sources: any[], toEntity?: boolean | ((source: any) => T)): T[];
     protected asObject(source: T, opts?: EntityAsObjectOptions): any;
     protected getRefetchQueriesForMutation(opts?: EntitySaveOptions): ((result: FetchResult<{
         data: any;

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

@@ -24,44 +24,44 @@ export declare type SuggestFn<T, F> = (value: any, filter?: F, sortBy?: string |
 export declare interface SuggestService<T, F> {
     suggest: SuggestFn<T, F>;
 }
-export declare interface EntityServiceLoadOptions {
+export declare interface EntityServiceLoadOptions<E = any> {
     fetchPolicy?: FetchPolicy;
     trash?: boolean;
-    toEntity?: boolean;
+    toEntity?: boolean | ((source: any) => E);
     query?: any;
     variables?: any;
     [key: string]: any;
 }
-export declare interface EntityServiceWatchOptions {
+export declare interface EntityServiceWatchOptions<T = any> {
     fetchPolicy?: WatchQueryFetchPolicy;
     trash?: boolean;
-    toEntity?: boolean;
+    toEntity?: boolean | ((source: any) => T);
     query?: any;
     variables?: any;
     [key: string]: any;
 }
-export declare interface EntityServiceListenChangesOptions {
+export declare interface EntityServiceListenChangesOptions<T = any> {
     interval?: number;
     fetchPolicy?: FetchPolicy;
-    toEntity?: boolean;
+    toEntity?: boolean | ((source: any) => T);
     query?: any;
     variables?: any;
     [key: string]: any;
 }
-export declare interface IEntityService<T, ID = any, LO = EntityServiceLoadOptions> {
+export declare interface IEntityService<T, ID = any, LO = EntityServiceLoadOptions<T>> {
     load(id: ID, opts?: LO): Promise<T>;
     canUserWrite(data: T, opts?: any): boolean;
     save(data: T, opts?: any): Promise<T>;
     delete(data: T, opts?: any): Promise<any>;
     listenChanges(id: ID, opts?: any): Observable<T | undefined>;
 }
-export declare interface EntitiesServiceLoadOptions extends EntityServiceLoadOptions {
+export declare interface EntitiesServiceLoadOptions<T = any> extends EntityServiceLoadOptions<T> {
     withTotal?: boolean;
 }
-export declare interface EntitiesServiceWatchOptions extends EntityServiceWatchOptions {
+export declare interface EntitiesServiceWatchOptions<T = any> extends EntityServiceWatchOptions<T> {
     withTotal?: boolean;
 }
-export declare interface IEntitiesService<T, F, O extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions> {
+export declare interface IEntitiesService<T, F, O extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions<T>> {
     watchAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<F>, options?: O): Observable<LoadResult<T>>;
     saveAll(data: T[], opts?: any): Promise<T[]>;
     deleteAll(data: T[], opts?: any): Promise<any>;

package/src/assets/manifest.json

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