@sumaris-net/ngx-components 18.4.5-alpha1 → 18.5.0-alpha2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sumaris-net/ngx-components",
   "description": "SUMARiS Angular components",
-  "version": "18.4.5-alpha1",
+  "version": "18.5.0-alpha2",
   "author": "contact@e-is.pro",
   "license": "AGPL-3.0",
   "readmeFilename": "README.md",
@@ -16,9 +16,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@maskito/angular": "~3.2.0",
-    "@maskito/core": "~3.2.0",
-    "@maskito/kit": "~3.2.0",
+    "@maskito/angular": "^3.2.1",
+    "@maskito/core": "^3.2.1",
+    "@maskito/kit": "^3.2.1",
     "@noble/ed25519": "^1.7.3",
     "@polkadot/util": "~12.6.2",
     "@polkadot/util-crypto": "~12.6.2",
@@ -29,7 +29,7 @@
     "tslib": "^2.3.0"
   },
   "peerDependencies": {
-    "@apollo/client": "~3.11.9",
+    "@apollo/client": "^3.12.4",
     "@ionic/storage": "~4.0.0",
     "d3": "~7.6.1",
     "localforage": "~1.10.0",
@@ -37,26 +37,25 @@
     "zone.js": "~0.14.10"
   },
   "optionalDependencies": {
-    "@awesome-cordova-plugins/core": "~6.4.0",
-    "@awesome-cordova-plugins/network": "~6.4.0",
-    "@capacitor-community/native-audio": "~4.0.0-0",
-    "@capacitor/android": "~4.8.2",
-    "@capacitor/app": "~4.1.1",
-    "@capacitor/browser": "~4.1.1",
-    "@capacitor/camera": "~4.1.5",
-    "@capacitor/clipboard": "~4.1.0",
-    "@capacitor/core": "~4.8.2",
-    "@capacitor/geolocation": "~4.1.0",
-    "@capacitor/haptics": "~4.1.0",
-    "@capacitor/keyboard": "~4.1.1",
-    "@capacitor/splash-screen": "~4.2.0",
-    "@capacitor/status-bar": "~4.1.1",
-    "@e-is/cordova-plugin-downloader": "~1.2.0",
+    "@capacitor-community/native-audio": "~6.0.0",
+    "@capacitor/android": "6.2.0",
+    "@capacitor/app": "~6.0.2",
+    "@capacitor/browser": "~6.0.4",
+    "@capacitor/camera": "~6.1.2",
+    "@capacitor/clipboard": "~6.0.2",
+    "@capacitor/core": "~6.2.0",
+    "@capacitor/geolocation": "~6.1.0",
+    "@capacitor/haptics": "~6.0.2",
+    "@capacitor/keyboard": "~6.0.3",
+    "@capacitor/network": "^6.0.3",
+    "@capacitor/splash-screen": "~6.0.3",
+    "@capacitor/status-bar": "~6.0.2",
+    "@e-is/cordova-plugin-audiomanagement": "^1.0.3",
+    "@e-is/cordova-plugin-downloader": "^1.2.0",
     "@ionic-native/audio-management": "^5.36.0",
     "@ionic-native/core": "^5.36.0",
     "@ionic-native/downloader": "^5.36.0",
     "clipboard": "^2.0.11",
-    "clovelced-plugin-audiomanagement": "~1.0.2",
     "cordova-sqlite-storage": "~6.0.0",
     "emoji-toolkit": ">= 8.0.0 < 10.0.0",
     "localforage-cordovasqlitedriver": "~1.8.0",

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, WatchQueryFetchPolicy } from '@apollo/client/core';
+import { ApolloCache, ApolloClient, FetchPolicy, MutationUpdaterFn, 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 { Platform } from '@ionic/angular';
 import { IEntity } from '../services/model/entity.model';
-import { Resolvers } from '@apollo/client/core/types';
+import { type DefaultContext, 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';
@@ -16,6 +16,7 @@ import { PropertyMap } from '../../shared/types';
 import { StartableService } from '../../shared/services/startable-service.class';
 import { StorageService } from '../../shared/storage/storage.service';
 import { DocumentNode } from 'graphql';
+import type { MaybeMasked } from '@apollo/client/masking';
 import * as i0 from "@angular/core";
 export interface WatchQueryOptions<V> {
     query: any;
@@ -23,7 +24,7 @@ export interface WatchQueryOptions<V> {
     error?: ServiceError;
     fetchPolicy?: WatchQueryFetchPolicy;
 }
-export interface MutateQueryOptions<TData, TVariables = OperationVariables> extends MutationBaseOptions<TData, TVariables> {
+export interface MutateQueryOptions<TData, TVariables = OperationVariables, TContext = DefaultContext, TCache extends ApolloCache<any> = ApolloCache<any>> extends MutationBaseOptions<TData, TVariables, TContext, TCache> {
     mutation: any;
     variables?: TVariables;
     error?: ServiceError;
@@ -32,9 +33,9 @@ export interface MutateQueryOptions<TData, TVariables = OperationVariables> exte
         tracked?: boolean;
         timeout?: number;
     };
-    optimisticResponse?: TData;
+    optimisticResponse?: Unmasked<NoInfer<TData>>;
     offlineResponse?: TData | ((context: any) => Promise<TData>);
-    update?: MutationUpdaterFn<TData> | MutationUpdaterFunction<TData, TVariables, any, ApolloCache<TData>>;
+    update?: MutationUpdaterFn<TData> | MutationUpdaterFunction<TData, TVariables, TContext, TCache>;
     forceOffline?: boolean;
 }
 export declare const APP_GRAPHQL_TYPE_POLICIES: InjectionToken<TypePolicies>;
@@ -78,7 +79,7 @@ export declare class GraphqlService extends StartableService<ApolloClient<any>>
         variables?: V;
         error?: ServiceError;
         fetchPolicy?: FetchPolicy;
-    }): Promise<T>;
+    }): Promise<MaybeMasked<T>>;
     watchQueryRef<T, V = EmptyObject>(opts: WatchQueryOptions<V>): QueryRef<T, V>;
     queryRefValuesChanges<T, V = EmptyObject>(queryRef: QueryRef<T, V>, opts: WatchQueryOptions<V>): Observable<T>;
     watchQuery<T, V = EmptyObject>(opts: WatchQueryOptions<V>): Observable<T>;

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

@@ -5,22 +5,23 @@ import { Peer } from './model/peer.model';
 import { ModalController, Platform, ToastController } from '@ionic/angular';
 import { ISelectPeerModalOptions } from '../peer/select-peer.modal';
 import { BehaviorSubject, Subscription } from 'rxjs';
+import { ConnectionType } from '@capacitor/network';
 import { LocalSettingsService } from './local-settings.service';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Network } from '@awesome-cordova-plugins/network/ngx';
 import { CacheService } from 'ionic-cache';
 import { ShowToastOptions } from '../../shared/toast/toasts';
 import { OverlayEventDetail } from '@ionic/core';
 import { AppManifest, NodeInfo } from './network.utils';
 import { Environment } from '../../../environments/environment.class';
 import { StartableObservableService } from '../../shared/services/startable-observable-service.class';
-import { ConnectionType, NetworkEventType } from './network.types';
+import { NetworkEventType } from './network.types';
 import { ILoggingService } from '../../shared/logging/logger.model';
 import * as i0 from "@angular/core";
 export declare const PEER_URL_REGEXP: RegExp;
 export declare const NETWORK_DEFAULT_CONNECTION_TIMEOUT = 10000;
 export declare class NetworkService extends StartableObservableService<Peer, Peer> {
     private _document;
+    private platform;
     private modalCtrl;
     private storage;
     private settings;
@@ -35,7 +36,6 @@ export declare class NetworkService extends StartableObservableService<Peer, Pee
     onResetNetworkCache: EventEmitter<any>;
     private readonly _mobile;
     private readonly _logger;
-    private readonly _network;
     private _timerSubscription;
     private readonly _timerRefreshPeriod;
     private readonly _timerRefreshCondition;
@@ -49,7 +49,7 @@ export declare class NetworkService extends StartableObservableService<Peer, Pee
     get peer(): Peer;
     set peer(peer: Peer);
     get connectionTimeout(): number;
-    constructor(_document: any, platform: Platform, modalCtrl: ModalController, storage: Storage, settings: LocalSettingsService, cache: CacheService, http: HttpClient, environment: Environment, loggingService: ILoggingService, network: Network, translate: TranslateService, toastController: ToastController);
+    constructor(_document: any, platform: Platform, modalCtrl: ModalController, storage: Storage, settings: LocalSettingsService, cache: CacheService, http: HttpClient, environment: Environment, loggingService: ILoggingService, translate: TranslateService, toastController: ToastController);
     /**
      * Register to network event
      *
@@ -138,7 +138,7 @@ export declare class NetworkService extends StartableObservableService<Peer, Pee
         timeout?: number;
     }): Promise<T>;
     protected getUri(path: string): string;
-    protected onDeviceConnectionChanged(connectionType?: string): void;
+    protected onDeviceConnectionChanged(connectionType?: ConnectionType): void;
     /**
      * Get default peers, from environment
      */
@@ -146,6 +146,6 @@ export declare class NetworkService extends StartableObservableService<Peer, Pee
     protected showToast<T = any>(opts: ShowToastOptions): Promise<OverlayEventDetail<T>>;
     protected addListener<T = any>(name: NetworkEventType, callback: (data?: T) => Promise<void>): Subscription;
     protected emit<T = any>(name: NetworkEventType, data?: T): Promise<void[]>;
-    static ɵfac: i0.ɵɵFactoryDeclaration<NetworkService, [null, null, null, null, null, null, null, null, { optional: true; }, { optional: true; }, { optional: true; }, { optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<NetworkService, [null, null, null, null, null, null, null, null, { optional: true; }, { optional: true; }, { optional: true; }]>;
     static ɵprov: i0.ɵɵInjectableDeclaration<NetworkService>;
 }

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

@@ -1,5 +1,3 @@
-import { Connection } from '@awesome-cordova-plugins/network/ngx';
-export type ConnectionType = 'none' | 'wifi' | 'ethernet' | 'cellular' | 'unknown';
 export type AuthTokenType = 'token' | 'basic' | 'basic-and-token';
-export declare function getConnectionType(type: Connection | string): ConnectionType;
 export declare type NetworkEventType = 'start' | 'peerChanged' | 'statusChanged' | 'resetCache' | 'beforeTryOnlineFinish';
+export type ConnectionType = 'none' | 'wifi' | 'cellular' | 'unknown';

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

@@ -1,6 +1,8 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Peer } from './model/peer.model';
 import { NodeFeature } from './model/node-feature.model';
+import { ConnectionStatus, ConnectionType } from '@capacitor/network';
+import { Observable } from 'rxjs';
 export interface NodeInfo {
     softwareName: string;
     softwareVersion: string;
@@ -30,4 +32,7 @@ export declare class NetworkUtils {
         };
         responseType?: 'json';
     }): Promise<NodeInfo>;
+    static isPluginAvailable(): boolean;
+    static statusChanges(): Observable<ConnectionStatus>;
+    static getConnectionType(): Promise<ConnectionType>;
 }