@nano-lib/util 1.1.5 → 1.1.7

package/lib/index.d.ts

@@ -4,7 +4,7 @@ import { parseTime, getTimeDistance, getDayRange } from './utils/date';
 import { addClass, removeClass, hasClass, toggleClass, noContextmenu, useRafThrottle } from './utils/element';
 import { encodeURIToParams, paramsToQueryString, queryStringToParams, errorCodeToString, YNToString, HNToString, valueToLabel, chargeToLabel, cascaderToLabel, multipleSelectToLabel, phoneToAsterisk, idNumberToAsterisk, firstLetterToUpperCase, firstLetterToLowerCase } from './utils/to';
 import { validHttp, validExternal, validString, validNumberStr, validEmptyObject, validURL, validPassword, validEmail, validIdNumber, validPhone, validTel } from './utils/valid';
-export { default as Request } from './utils/request/request';
+export { default as Request } from './utils/request/index';
 export { default as NetworkManager } from './utils/request/network';
 export { default as TokenManager } from './utils/request/token';
 export { default as getRequestBaseUrl } from './utils/baseUrl';

package/lib/{utils/request/types.d.ts → types/request.d.ts}

@@ -1,4 +1,4 @@
-import { AnyObj } from '../../types';
+import { AnyObj } from '.';
 import { AxiosRequestConfig, InternalAxiosRequestConfig } from 'axios';
 export interface RequestOptions {
     showLoading?: boolean;
@@ -40,13 +40,12 @@ export interface PendingRequest {
     resolve: (value: any) => void;
     reject: (reason?: any) => void;
 }
-export interface ToastInstanceType<T = AnyObj> {
-    show(message: string, type: 'success' | 'warning' | 'info' | 'error', options: T): void;
-    success(message: string, options?: T): void;
-    error(message: string, options?: T): void;
-    warning(message: string, options?: T): void;
-    info(message: string, options?: T): void;
-    confirm(message: string, title: string, options: T): Promise<boolean>;
+export interface ToastInstanceType<T extends string = string, U extends AnyObj = AnyObj> {
+    show(message: string, type: T, options: U): void;
+    success(message: string, options?: U): void;
+    error(message: string, options?: U): void;
+    warning(message: string, options?: U): void;
+    info(message: string, options?: U): void;
     clear(): void;
 }
 export interface LoadingOptions {
@@ -61,8 +60,8 @@ export interface LoadingInstanceType {
     forceHide(): void;
     isLoading(): boolean;
 }
-export interface RequestConstructorOptions extends RequestConfig {
-    toastInstance: ToastInstanceType;
+export interface RequestConstructorOptions<T extends string, U extends AnyObj> extends RequestConfig {
+    toastInstance: ToastInstanceType<T, U>;
     loadingInstance?: LoadingInstanceType;
 }
 export interface BaseResponse<T = any> {

package/lib/utils/request/cancel.d.ts

@@ -1,4 +1,4 @@
-import { CustomInternalAxiosRequestConfig } from './types';
+import { CustomInternalAxiosRequestConfig } from '../../types/request';
 export default class CancelManager {
     private pendingMap;
     private generateRequestKey;

package/lib/utils/request/error.d.ts

@@ -1,5 +1,5 @@
 import { AxiosError } from 'axios';
-import { ToastInstanceType } from './types';
+import { ToastInstanceType } from '../../types/request';
 export default class ErrorManager {
     private toastInstance;
     constructor(toastInstance: ToastInstanceType);

package/lib/utils/request/{request.d.ts → index.d.ts}

@@ -1,6 +1,7 @@
 import { AxiosRequestConfig } from 'axios';
-import { RequestConstructorOptions, RequestOptions, RequestParams } from './types';
-export default class Request {
+import { AnyObj } from '../../types';
+import { RequestConstructorOptions, RequestOptions, RequestParams } from '../../types/request';
+export default class Request<ToastType extends string = string, ToastOptions extends AnyObj = AnyObj> {
     private axiosInstance;
     private errorInstance;
     private networkInstance;
@@ -11,7 +12,7 @@ export default class Request {
     private requestInstanceRequestOptions;
     private defaultRequestOptions;
     private defaultConfig;
-    constructor(options: RequestConstructorOptions);
+    constructor(options: RequestConstructorOptions<ToastType, ToastOptions>);
     private setupNetworkListener;
     private setupInterceptors;
     private refreshTokenInBackend;

package/lib/utils/request/network.d.ts

@@ -1,5 +1,5 @@
-import { NetworkStatus, PendingRequest, ToastInstanceType } from './types';
-export default class NetworkManager {
+import { NetworkStatus, PendingRequest, ToastInstanceType } from '../../types/request';
+export default class NetworkManage {
     private toastInstance;
     private status;
     private offlineQueue;

package/lib/utils/request/token.d.ts

@@ -1,4 +1,4 @@
-import { PromiseResponse, TokenInfo } from './types';
+import { PromiseResponse, TokenInfo } from '../../types/request';
 export default class TokenManager {
     private TOKEN_KEY;
     private REFRESH_TOKEN_KEY;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nano-lib/util",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "Custom utility functions for the nano library",
   "author": "xylo",
   "license": "MIT",