@peng_kai/kit 0.1.9 → 0.1.11

package/request/helpers.ts

@@ -1,49 +1,49 @@
-import type { AxiosInstance } from 'axios';
-
-export { isTimeout, getServices, ApiCode, ApiError };
-
-enum ApiCode {
-  NORMAL = 0, // 正常
-  UNKNOWN = -1, // 未知错误
-  TIMEOUT = -2, // 请求超时
-}
-
-function getServices() {
-  const serversModule = getServices.modules;
-  const servers: Record<string, { server: AxiosInstance } | undefined> = {};
-
-  for (const [key, module] of Object.entries(serversModule)) {
-    const name = key.match(/\/([0-9a-zA-Z]+)\.ts$/)?.[1];
-
-    if (name)
-      servers[`${name}.api`] = module as any;
-  }
-
-  return servers;
-}
-getServices.modules = {} as any;
-
-function isTimeout(error: any) {
-  return error?.message?.toLowerCase().includes('timeout');
-}
-
-class ApiError<TResp = any> extends Error {
-  public static is<ErrorResp = any>(error: any): error is ApiError<ErrorResp> {
-    return !!error?.isApiError;
-  }
-
-  /**
-   * 将HTTP status和Api code统一到一个code里
-   */
-  public code: number;
-  public msg: string;
-  public data: TResp;
-  public isApiError = true;
-
-  public constructor(info: { code: number, msg: string, data: TResp }) {
-    super(info.msg);
-    this.code = info.code;
-    this.msg = info.msg;
-    this.data = info.data;
-  }
-}
+import type { AxiosInstance } from 'axios';
+
+export { isTimeout, getServices, ApiCode, ApiError };
+
+enum ApiCode {
+  NORMAL = 0, // 正常
+  UNKNOWN = -1, // 未知错误
+  TIMEOUT = -2, // 请求超时
+}
+
+function getServices() {
+  const serversModule = getServices.modules;
+  const servers: Record<string, { server: AxiosInstance } | undefined> = {};
+
+  for (const [key, module] of Object.entries(serversModule)) {
+    const name = key.match(/\/([0-9a-zA-Z]+)\.ts$/)?.[1];
+
+    if (name)
+      servers[`${name}.api`] = module as any;
+  }
+
+  return servers;
+}
+getServices.modules = {} as any;
+
+function isTimeout(error: any) {
+  return error?.message?.toLowerCase().includes('timeout');
+}
+
+class ApiError<TResp = any> extends Error {
+  public static is<ErrorResp = any>(error: any): error is ApiError<ErrorResp> {
+    return !!error?.isApiError;
+  }
+
+  /**
+   * 将HTTP status和Api code统一到一个code里
+   */
+  public code: number;
+  public msg: string;
+  public data: TResp;
+  public isApiError = true;
+
+  public constructor(info: { code: number, msg: string, data: TResp }) {
+    super(info.msg);
+    this.code = info.code;
+    this.msg = info.msg;
+    this.data = info.data;
+  }
+}

package/request/interceptors/formatPaging.ts

@@ -12,10 +12,9 @@ export function formatPaging(): Parameters<AxiosInterceptorManager<any>['use']>
         return resp;
 
       if (result.pagination) {
-        result.data = {
-          list: result.data,
-          pagination: result.pagination,
-        };
+        const originData = result.data;
+        result.data = originData.list ? { ...originData } : { list: originData };
+        result.data.pagination = result.pagination;
 
         Reflect.deleteProperty(result, 'pagination');
       }

package/request/interceptors/popupMessage.ts

@@ -19,7 +19,8 @@ export function popupMessage(popup: (type: 'error' | 'success', message: string)
       if (typeof successMessageConfig !== 'string')
         successMsg = resp?.data?.msg;
 
-      popup('success', successMsg);
+      if (typeof successMsg === 'string' && successMsg !== '')
+        popup('success', successMsg);
 
       return resp;
     },
@@ -32,7 +33,7 @@ export function popupMessage(popup: (type: 'error' | 'success', message: string)
       let errorMsg: boolean | string = errorMessageConfig;
 
       if (axios.isAxiosError(error)) {
-      // 请求超时
+        // 请求超时
         if (isTimeout(error))
           errorMsg = 'Request Timeout';
         else if (typeof errorMessageConfig !== 'string')
@@ -42,10 +43,10 @@ export function popupMessage(popup: (type: 'error' | 'success', message: string)
         errorMsg = error.message;
       }
 
-      if (typeof errorMsg === 'string')
+      if (typeof errorMsg === 'string' && errorMsg !== '')
         popup('error', errorMsg);
 
       throw error;
     },
   ];
-}
+}

package/request/interceptors/toLogin.ts

@@ -1,15 +1,26 @@
-import type { AxiosInterceptorManager } from 'axios';
-
-export function toLogin(authPath = `${window.location.origin}/auth/login`, code = 15001): Parameters<AxiosInterceptorManager<any>['use']> {
-  return [
-    undefined,
-    (err) => {
-      if (err.code !== code)
-        throw err;
-
-      const url = new URL(authPath);
-      url.searchParams.set('redirect', window.location.href);
-      window.location.href = url.toString();
-    },
-  ];
-}
+import type { AxiosInterceptorManager } from 'axios';
+
+const REDIRECT_KEY = 'redirect';
+
+export function toLogin(authPath = `${window.location.origin}/auth/login`, code = 15001): Parameters<AxiosInterceptorManager<any>['use']> {
+  return [
+    undefined,
+    (err) => {
+      if (err.code !== code)
+        throw err;
+
+      const currentURL = new URL(window.location.href);
+      const targetURL = new URL(authPath);
+
+      if (currentURL.searchParams.has(REDIRECT_KEY))
+        targetURL.searchParams.set(REDIRECT_KEY, currentURL.searchParams.get(REDIRECT_KEY)!);
+      else
+        targetURL.searchParams.set(REDIRECT_KEY, window.location.href);
+
+      if (currentURL.toString() === targetURL.toString())
+        return;
+
+      window.location.href = targetURL.toString();
+    },
+  ];
+}

package/request/queryClient.ts

@@ -1,24 +1,48 @@
-import type { QueryClientConfig } from '@tanstack/vue-query';
+import type { QueryClientConfig, QueryObserverOptions } from '@tanstack/vue-query';
+import { ApiCode } from './helpers';
 
 /** 不需要重试的 api code */
 export const ignoreRetryCodes = [
+  ApiCode.UNKNOWN,
   11000, // 操作失败
   11001, // 操作过于频繁
   11002, // 权限不足
   11003, // 缺少必要参数
   15001, // 未登录
+  15003, // 用户不存在
+  /^3{2}$/, // HTTP status 3xx
+  /^4{2}$/, // HTTP status 4xx
+  /^5{2}$/, // HTTP status 5xx
 ];
 
+/**
+ * 构建用于查询的重试函数。
+ * @param ignoreList 一个数组，包含要在重试期间忽略的错误代码的数字、字符串或正则表达式。
+ * @param additionPresetIgnore 一个布尔值，指示是否包括额外的预设忽略代码。默认为 true。
+ * @returns 根据失败计数和错误代码确定是否重试的重试函数。
+ */
+export function buildRetryFn(ignoreList: Array<number | string | RegExp>, additionPresetIgnore = true): NonNullable<QueryObserverOptions['retry']> {
+  const _ignoreList = [...ignoreList, ...(additionPresetIgnore ? ignoreRetryCodes : [])];
+  return (failureCount, error: any) => {
+    if (error?.code === undefined)
+      return false;
+
+    const ignored = _ignoreList.some((code) => {
+      if (code instanceof RegExp)
+        return code.test(String(error?.code));
+
+      return code === error?.code;
+    });
+
+    return ignored ? false : failureCount < 2;
+  };
+}
+
 export const presetOptions: QueryClientConfig = {
   defaultOptions: {
     queries: {
       refetchOnWindowFocus: false,
-      retry(failureCount, error: any) {
-        if (ignoreRetryCodes.includes(error?.code))
-          return false;
-
-        return failureCount < 3;
-      },
+      retry: buildRetryFn(ignoreRetryCodes),
       getNextPageParam: (lastPage: any) => {
         const { pagination } = lastPage ?? {};
 
@@ -39,4 +63,4 @@ export const presetOptions: QueryClientConfig = {
       },
     },
   },
-};
+};

package/request/request.ts

@@ -1,5 +1,4 @@
 import type { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
-import { isSSR } from '../utils';
 
 export { createRequest };
 

package/request/type.d.ts

@@ -1,92 +1,92 @@
-declare namespace Api {
-  type Request = ((reqData: any, options?: Options) => Promise<any>) & {
-    id: string
-    setDefaultConfig: (config: Partial<import('axios').AxiosRequestConfig>) => Request
-  };
-  // type RequestPagination = (reqData: Partial<PageParam>, options?: Options) => Promise<PaginationData<any>>;
-  interface PageParam {
-    page: number
-    page_size: number
-  }
-  interface PageInfo {
-    has_more: boolean
-    page: number
-    page_size: number
-    total: number
-  }
-  interface PageData<T = any> {
-    list: T[] | null
-    pagination: PaginationInfo
-    [k in string]: any
-  }
-  interface Result<T = any | PageData<any>> {
-    code: number
-    msg: string
-    data: T
-  }
-  type GetParam<A extends Request> = A extends (reqData: infer R) => any ? R : any;
-  type GetData<A extends Request> = ReturnType<A> extends Promise<infer D> ? D : any;
-  type GetDataItem<A extends Request> = NonNullable<GetData<A>> extends { list: infer L }
-    ? NonNullable<L> extends Array<infer I>
-      ? I
-      : any
-    : any;
-  type GetDataField<R> = R extends { data: infer D } ? (D extends { list: any, pagination: any } ? D : D) : any;
-
-  /**
-   * 将api返回的分页数据转换成前端使用的分页数据格式，将分页数据格式统一
-   *
-   * ```
-   * {
-   *   code: number,
-   *   msg: string,
-   *   data: {
-   *     list: [],
-   *     pagination: {},
-   *     ...
-   *   }
-   * }
-   * ```
-   */
-  type TransformPageResult<R> = R extends { pagination: infer P, data: infer D }
-    ? D extends Record<string, any>
-      ? D extends { list: any }
-      ? {
-          [Rk in Exclude<keyof R, 'data' | 'pagination'>]: R[Rk];
-        } & {
-          data: D & { pagination: P }
-        }
-        : {
-          [Rk in Exclude<keyof R, 'data' | 'pagination'>]: R[Rk];
-        } & {
-          data: {
-            list: D
-            pagination: P
-          }
-        }
-      : R
-    : R;
-}
-
-// 测试用例 ----------------------------
-// type DDD1 = Api.TransformPageResult<{
-//   code: number
-//   msg: string
-//   data: {
-//     name: string
-//   }[]
-//   pagination: {
-//     page: number
-//   }
-// }>
-// type DDD2 = Api.TransformPageResult<{
-//   code: number
-//   msg: string
-//   data: {
-//     list: { name: string }[]
-//     total: {}
-//   }
-//   pagination: {
-//     page: number
-//   }
-// }>
+declare namespace Api {
+  type Request = ((reqData: any, options?: Options) => Promise<any>) & {
+    id: string
+    setDefaultConfig: (config: Partial<import('axios').AxiosRequestConfig>) => Request
+  };
+  // type RequestPagination = (reqData: Partial<PageParam>, options?: Options) => Promise<PaginationData<any>>;
+  interface PageParam {
+    page: number
+    page_size: number
+  }
+  interface PageInfo {
+    has_more: boolean
+    page: number
+    page_size: number
+    total: number
+  }
+  interface PageData<T = any> {
+    list: T[] | null
+    pagination: PaginationInfo
+    [k in string]: any
+  }
+  interface Result<T = any | PageData<any>> {
+    code: number
+    msg: string
+    data: T
+  }
+  type GetParam<A extends Request> = A extends (reqData: infer R) => any ? R : any;
+  type GetData<A extends Request> = ReturnType<A> extends Promise<infer D> ? D : any;
+  type GetDataItem<A extends Request> = NonNullable<GetData<A>> extends { list: infer L }
+    ? NonNullable<L> extends Array<infer I>
+      ? I
+      : any
+    : any;
+  type GetDataField<R> = R extends { data: infer D } ? (D extends { list: any, pagination: any } ? D : D) : any;
+
+  /**
+   * 将api返回的分页数据转换成前端使用的分页数据格式，将分页数据格式统一
+   *
+   * ```
+   * {
+   *   code: number,
+   *   msg: string,
+   *   data: {
+   *     list: [],
+   *     pagination: {},
+   *     ...
+   *   }
+   * }
+   * ```
+   */
+  type TransformPageResult<R> = R extends { pagination: infer P, data: infer D }
+    ? D extends Record<string, any>
+      ? D extends { list: any }
+      ? {
+          [Rk in Exclude<keyof R, 'data' | 'pagination'>]: R[Rk];
+        } & {
+          data: D & { pagination: P }
+        }
+        : {
+          [Rk in Exclude<keyof R, 'data' | 'pagination'>]: R[Rk];
+        } & {
+          data: {
+            list: D
+            pagination: P
+          }
+        }
+      : R
+    : R;
+}
+
+// 测试用例 ----------------------------
+// type DDD1 = Api.TransformPageResult<{
+//   code: number
+//   msg: string
+//   data: {
+//     name: string
+//   }[]
+//   pagination: {
+//     page: number
+//   }
+// }>
+// type DDD2 = Api.TransformPageResult<{
+//   code: number
+//   msg: string
+//   data: {
+//     list: { name: string }[]
+//     total: {}
+//   }
+//   pagination: {
+//     page: number
+//   }
+// }>

package/stylelint.config.cjs

@@ -1,7 +1,7 @@
-module.exports = {
-  // root: true,
-  extends: ['@peng_kai/lint/vue/stylelint_v2'],
-  rules: {
-    'custom-property-pattern': '(antd-([a-z][a-zA-Z0-9]+)*)|(([a-z][a-z0-9]*)(-[a-z0-9]+)*)',
-  },
-};
+module.exports = {
+  // root: true,
+  extends: ['@peng_kai/lint/vue/stylelint_v2'],
+  rules: {
+    'custom-property-pattern': '(antd-([a-z][a-zA-Z0-9]+)*)|(([a-z][a-z0-9]*)(-[a-z0-9]+)*)',
+  },
+};

package/tsconfig.json

@@ -1,50 +1,50 @@
-{
-  "compilerOptions": {
-    "target": "ES2020",
-    "jsx": "preserve",
-    "jsxFactory": "h",
-    "jsxFragmentFactory": "Fragment",
-    "lib": [
-      "ESNext",
-      "DOM",
-      "DOM.Iterable"
-    ],
-    "useDefineForClassFields": true,
-    "module": "ESNext",
-
-    /* Bundler mode */
-    "moduleResolution": "bundler",
-    "resolveJsonModule": true,
-    "allowImportingTsExtensions": true,
-
-    /* Linting */
-    "strict": true,
-    "noFallthroughCasesInSwitch": true,
-    "noImplicitAny": false,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noEmit": true,
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "isolatedModules": true,
-    "skipLibCheck": true
-  },
-  "include": [
-    "admin/**/*.ts",
-    "admin/**/*.d.ts",
-    "admin/**/*.tsx",
-    "admin/**/*.vue",
-    "antd/**/*.ts",
-    "antd/**/*.d.ts",
-    "antd/**/*.tsx",
-    "antd/**/*.vue",
-    "request/**/*.ts",
-    "request/**/*.d.ts",
-    "utils/**/*.ts",
-    "utils/**/*.d.ts",
-    "vue/**/*.ts",
-    "vue/**/*.d.ts",
-    "vue/**/*.tsx",
-    "vue/**/*.vue"
-  ]
-}
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "jsx": "preserve",
+    "jsxFactory": "h",
+    "jsxFragmentFactory": "Fragment",
+    "lib": [
+      "ESNext",
+      "DOM",
+      "DOM.Iterable"
+    ],
+    "useDefineForClassFields": true,
+    "module": "ESNext",
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "allowImportingTsExtensions": true,
+
+    /* Linting */
+    "strict": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitAny": false,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noEmit": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "isolatedModules": true,
+    "skipLibCheck": true
+  },
+  "include": [
+    "admin/**/*.ts",
+    "admin/**/*.d.ts",
+    "admin/**/*.tsx",
+    "admin/**/*.vue",
+    "antd/**/*.ts",
+    "antd/**/*.d.ts",
+    "antd/**/*.tsx",
+    "antd/**/*.vue",
+    "request/**/*.ts",
+    "request/**/*.d.ts",
+    "utils/**/*.ts",
+    "utils/**/*.d.ts",
+    "vue/**/*.ts",
+    "vue/**/*.d.ts",
+    "vue/**/*.tsx",
+    "vue/**/*.vue"
+  ]
+}

package/utils/index.ts

@@ -84,7 +84,7 @@ export function getScanBrowser(chain: string, hash: string, type: 'transaction'
     'POLYGON': () => `https://polygonscan.com/${evmType()}/${hash}`,
     'OKEXCHAIN': () => `https://www.okx.com/cn/explorer/oktc/${evmType()}/${hash}`,
     'OPBNB': () => `https://opbnbscan.com/${evmType()}/${hash}`,
-    'APOTS': () => {
+    'APTOS': () => {
       const _type = (<TypeMap>{ transaction: 'txn', address: 'account' })[type] ?? type;
       return `https://explorer.aptoslabs.com/${_type}/${hash}`;
     },
@@ -98,7 +98,7 @@ export function getScanBrowser(chain: string, hash: string, type: 'transaction'
     },
     'ZKSYNC': () => `https://explorer.zksync.io/${evmType()}/${hash}`,
     'SOLANA': () => {
-      const _type = (<TypeMap>{ address: 'account' })[type] ?? type;
+      const _type = (<TypeMap>{ address: 'account', transaction: 'tx' })[type] ?? type;
       return `https://solscan.io/${_type}/${hash}`;
     },
   }[_chain] ?? (() => '');

package/vue/components/infinite-query/index.ts

@@ -1 +1 @@
-export { default as InfiniteQuery } from './src/InfiniteQuery.vue';
+export { default as InfiniteQuery } from './src/InfiniteQuery.vue';