@sumaris-net/ngx-components 18.5.0-alpha3 → 18.5.0-rc2

package/package.json

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

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

@@ -1,13 +1,13 @@
 import { Observable } from 'rxjs';
 import { Apollo, ExtraSubscriptionOptions, QueryRef } from 'apollo-angular';
-import { ApolloCache, ApolloClient, FetchPolicy, MutationUpdaterFn, MutationUpdaterFunction, OperationVariables, TypePolicies, Unmasked, WatchQueryFetchPolicy } from '@apollo/client/core';
+import { ApolloCache, ApolloClient, FetchPolicy, MutationUpdaterFunction, OperationVariables, TypePolicies, Unmasked, WatchQueryFetchPolicy } from '@apollo/client/core';
 import { ServiceError } from '../services/errors';
 import { InjectionToken } from '@angular/core';
 import { NetworkService } from '../services/network.service';
-import { EmptyObject } from './graphql.utils';
+import { EmptyObject, TrackableMutationContext } from './graphql.utils';
 import { Platform } from '@ionic/angular';
 import { IEntity } from '../services/model/entity.model';
-import { type DefaultContext, Resolvers } from '@apollo/client/core/types';
+import { Resolvers } from '@apollo/client/core/types';
 import { HttpLink } from 'apollo-angular/http';
 import { ErrorPolicy, MutationBaseOptions } from '@apollo/client/core/watchQueryOptions';
 import { Cache } from '@apollo/client/cache/core/types/Cache';
@@ -23,18 +23,14 @@ export interface WatchQueryOptions<V> {
     error?: ServiceError;
     fetchPolicy?: WatchQueryFetchPolicy;
 }
-export interface MutateQueryOptions<TData, TVariables = OperationVariables, TContext = DefaultContext, TCache extends ApolloCache<any> = ApolloCache<any>> extends MutationBaseOptions<TData, TVariables, TContext, TCache> {
+export interface MutateQueryOptions<TData, TVariables = OperationVariables, TContext = TrackableMutationContext, TCache extends ApolloCache<any> = ApolloCache<any>> extends MutationBaseOptions<TData, TVariables, TContext, TCache> {
     mutation: any;
     variables?: TVariables;
     error?: ServiceError;
-    context?: {
-        serializationKey?: string;
-        tracked?: boolean;
-        timeout?: number;
-    };
+    context?: TContext;
     optimisticResponse?: Unmasked<NoInfer<TData>>;
-    offlineResponse?: TData | ((context: any) => Promise<TData>);
-    update?: MutationUpdaterFn<TData> | MutationUpdaterFunction<TData, TVariables, TContext, TCache>;
+    offlineResponse?: TData | ((context: TContext) => Promise<TData>);
+    update?: MutationUpdaterFunction<TData, TVariables, TContext, TCache>;
     forceOffline?: boolean;
 }
 export declare const APP_GRAPHQL_TYPE_POLICIES: InjectionToken<TypePolicies>;
@@ -137,7 +133,6 @@ export declare class GraphqlService extends StartableService<ApolloClient<any>>
     protected ngOnStart(): Promise<ApolloClient<any>>;
     protected ngOnStop(): Promise<void>;
     protected resetClient(client?: ApolloClient<any>): Promise<void>;
-    private onApolloError;
     private toApolloError;
     private createAppErrorByCode;
     private getI18nErrorMessageByCode;

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

@@ -21,6 +21,11 @@ export interface TrackedQuery {
     variablesJSON: string;
     contextJSON: string;
 }
+export interface TrackableMutationContext extends Record<string, any> {
+    serializationKey?: string;
+    tracked?: boolean;
+    timeout?: number;
+}
 export declare const TRACKED_QUERIES_STORAGE_KEY = "apollo-tracker-persist";
 export declare function createTrackerLink(opts: {
     storage?: PersistentStorage<string>;

package/src/app/core/services/network.types.d.ts

@@ -1,3 +1,4 @@
+import { ConnectionType } from '@capacitor/network';
 export type AuthTokenType = 'token' | 'basic' | 'basic-and-token';
 export declare type NetworkEventType = 'start' | 'peerChanged' | 'statusChanged' | 'resetCache' | 'beforeTryOnlineFinish';
-export type ConnectionType = 'none' | 'wifi' | 'cellular' | 'unknown';
+export { ConnectionType };