@kevisual/query 0.0.9-alpha.2 → 0.0.9

package/dist/query-browser.d.ts

@@ -50,6 +50,11 @@ declare class QueryWs {
     getOpen(): boolean;
 }
 
+/**
+ * 请求前处理函数
+ * @param opts 请求配置
+ * @returns 请求配置
+ */
 type Fn = (opts: {
     url?: string;
     headers?: Record<string, string>;
@@ -74,10 +79,14 @@ type Result<S = any> = {
     data?: S;
     message?: string;
     success: boolean;
+    /**
+     * 是否不返回 message
+     */
+    noMsg?: boolean;
 };
 type DataOpts = Partial<QueryOpts$1> & {
     beforeRequest?: Fn;
-    afterResponse?: (result: Result) => Promise<any>;
+    afterResponse?: <S, U = S>(result: Result<S>) => Promise<U>;
 };
 /**
  * const query = new Query();
@@ -88,7 +97,7 @@ type DataOpts = Partial<QueryOpts$1> & {
  *
  * U是参数 V是返回值
  */
-declare class Query<U = any, V = any> {
+declare class Query<R = any> {
     adapter: typeof adapter;
     url: string;
     beforeRequest?: Fn;
@@ -96,9 +105,33 @@ declare class Query<U = any, V = any> {
     headers?: Record<string, string>;
     timeout?: number;
     constructor(opts?: QueryOpts$1);
-    get<T = any, S = any>(params: Record<string, any> & Data & U & T, options?: DataOpts): Promise<Result<V & S>>;
-    post<T = any, S = any>(body: Record<string, any> & Data & T, options?: DataOpts): Promise<Result<S>>;
+    /**
+     * 发送 get 请求，转到 post 请求
+     *  T是请求类型自定义
+     *  S是返回类型自定义
+     * @param params 请求参数
+     * @param options 请求配置
+     * @returns 请求结果
+     */
+    get<T = any, S = any>(params: Record<string, any> & Data & T, options?: DataOpts): Promise<Result<R & S>>;
+    /**
+     * 发送 post 请求
+     *  T是请求类型自定义
+     *  S是返回类型自定义
+     * @param body 请求体
+     * @param options 请求配置
+     * @returns 请求结果
+     */
+    post<T = any, S = any>(body: Record<string, any> & Data & T, options?: DataOpts): Promise<Result<R & S>>;
+    /**
+     * 请求前处理，设置请求前处理函数
+     * @param fn 处理函数
+     */
     before(fn: Fn): void;
+    /**
+     * 请求后处理，设置请求后处理函数
+     * @param fn 处理函数
+     */
     after(fn: (result: Result) => Promise<any>): void;
 }
 
@@ -111,7 +144,7 @@ type QueryOpts = {
 /**
  * 前端调用后端QueryRouter
  */
-declare class QueryClient<U = any, V = any> extends Query<U, V> {
+declare class QueryClient<R = any> extends Query<R> {
     tokenName: string;
     storage: Storage;
     token: string;
@@ -127,4 +160,5 @@ declare class QueryClient<U = any, V = any> extends Query<U, V> {
     removeToken(): void;
 }
 
-export { Query, QueryClient, type QueryOpts, QueryWs, type QueryWsOpts, adapter };
+export { Query, QueryClient, QueryWs, adapter };
+export type { QueryOpts, QueryWsOpts };

package/dist/query-browser.js

@@ -245,9 +245,25 @@ class Query {
         };
         this.timeout = opts?.timeout || 60000 * 3; // 默认超时时间为 60s * 3
     }
+    /**
+     * 发送 get 请求，转到 post 请求
+     *  T是请求类型自定义
+     *  S是返回类型自定义
+     * @param params 请求参数
+     * @param options 请求配置
+     * @returns 请求结果
+     */
     async get(params, options) {
         return this.post(params, options);
     }
+    /**
+     * 发送 post 请求
+     *  T是请求类型自定义
+     *  S是返回类型自定义
+     * @param body 请求体
+     * @param options 请求配置
+     * @returns 请求结果
+     */
     async post(body, options) {
         const url = options?.url || this.url;
         const headers = { ...this.headers, ...options?.headers };
@@ -267,7 +283,7 @@ class Query {
             }
         }
         catch (e) {
-            console.error(e);
+            console.error('request beforeFn error', e, req);
             return {
                 code: 500,
                 success: false,
@@ -283,7 +299,7 @@ class Query {
                 return res;
             }
             catch (e) {
-                console.error(e);
+                console.error('request error', e, req);
                 return {
                     code: 500,
                     success: false,
@@ -292,9 +308,17 @@ class Query {
             }
         });
     }
+    /**
+     * 请求前处理，设置请求前处理函数
+     * @param fn 处理函数
+     */
     before(fn) {
         this.beforeRequest = fn;
     }
+    /**
+     * 请求后处理，设置请求后处理函数
+     * @param fn 处理函数
+     */
     after(fn) {
         this.afterResponse = fn;
     }

package/dist/query-ws.d.ts

@@ -45,4 +45,5 @@ declare class QueryWs {
     getOpen(): boolean;
 }
 
-export { type QuerySelectState, QueryWs, type QueryWsOpts, type QueryWsStoreListener, type WsOnMessage, type WsSend };
+export { QueryWs };
+export type { QuerySelectState, QueryWsOpts, QueryWsStoreListener, WsOnMessage, WsSend };

package/dist/query.d.ts

@@ -12,6 +12,11 @@ type AdapterOpts = {
  */
 declare const adapter: (opts: AdapterOpts, overloadOpts?: RequestInit) => Promise<any>;
 
+/**
+ * 请求前处理函数
+ * @param opts 请求配置
+ * @returns 请求配置
+ */
 type Fn = (opts: {
     url?: string;
     headers?: Record<string, string>;
@@ -36,10 +41,14 @@ type Result<S = any> = {
     data?: S;
     message?: string;
     success: boolean;
+    /**
+     * 是否不返回 message
+     */
+    noMsg?: boolean;
 };
 type DataOpts = Partial<QueryOpts> & {
     beforeRequest?: Fn;
-    afterResponse?: (result: Result) => Promise<any>;
+    afterResponse?: <S, U = S>(result: Result<S>) => Promise<U>;
 };
 /**
  * const query = new Query();
@@ -50,7 +59,7 @@ type DataOpts = Partial<QueryOpts> & {
  *
  * U是参数 V是返回值
  */
-declare class Query<U = any, V = any> {
+declare class Query<R = any> {
     adapter: typeof adapter;
     url: string;
     beforeRequest?: Fn;
@@ -58,10 +67,35 @@ declare class Query<U = any, V = any> {
     headers?: Record<string, string>;
     timeout?: number;
     constructor(opts?: QueryOpts);
-    get<T = any, S = any>(params: Record<string, any> & Data & U & T, options?: DataOpts): Promise<Result<V & S>>;
-    post<T = any, S = any>(body: Record<string, any> & Data & T, options?: DataOpts): Promise<Result<S>>;
+    /**
+     * 发送 get 请求，转到 post 请求
+     *  T是请求类型自定义
+     *  S是返回类型自定义
+     * @param params 请求参数
+     * @param options 请求配置
+     * @returns 请求结果
+     */
+    get<T = any, S = any>(params: Record<string, any> & Data & T, options?: DataOpts): Promise<Result<R & S>>;
+    /**
+     * 发送 post 请求
+     *  T是请求类型自定义
+     *  S是返回类型自定义
+     * @param body 请求体
+     * @param options 请求配置
+     * @returns 请求结果
+     */
+    post<T = any, S = any>(body: Record<string, any> & Data & T, options?: DataOpts): Promise<Result<R & S>>;
+    /**
+     * 请求前处理，设置请求前处理函数
+     * @param fn 处理函数
+     */
     before(fn: Fn): void;
+    /**
+     * 请求后处理，设置请求后处理函数
+     * @param fn 处理函数
+     */
     after(fn: (result: Result) => Promise<any>): void;
 }
 
-export { Query, type QueryOpts, adapter };
+export { Query, adapter };
+export type { QueryOpts };

package/dist/query.js

@@ -70,9 +70,25 @@ class Query {
         };
         this.timeout = opts?.timeout || 60000 * 3; // 默认超时时间为 60s * 3
     }
+    /**
+     * 发送 get 请求，转到 post 请求
+     *  T是请求类型自定义
+     *  S是返回类型自定义
+     * @param params 请求参数
+     * @param options 请求配置
+     * @returns 请求结果
+     */
     async get(params, options) {
         return this.post(params, options);
     }
+    /**
+     * 发送 post 请求
+     *  T是请求类型自定义
+     *  S是返回类型自定义
+     * @param body 请求体
+     * @param options 请求配置
+     * @returns 请求结果
+     */
     async post(body, options) {
         const url = options?.url || this.url;
         const headers = { ...this.headers, ...options?.headers };
@@ -92,7 +108,7 @@ class Query {
             }
         }
         catch (e) {
-            console.error(e);
+            console.error('request beforeFn error', e, req);
             return {
                 code: 500,
                 success: false,
@@ -108,7 +124,7 @@ class Query {
                 return res;
             }
             catch (e) {
-                console.error(e);
+                console.error('request error', e, req);
                 return {
                     code: 500,
                     success: false,
@@ -117,9 +133,17 @@ class Query {
             }
         });
     }
+    /**
+     * 请求前处理，设置请求前处理函数
+     * @param fn 处理函数
+     */
     before(fn) {
         this.beforeRequest = fn;
     }
+    /**
+     * 请求后处理，设置请求后处理函数
+     * @param fn 处理函数
+     */
     after(fn) {
         this.afterResponse = fn;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/query",
-  "version": "0.0.9-alpha.2",
+  "version": "0.0.9",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,10 +22,10 @@
   "license": "ISC",
   "description": "",
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "^16.0.0",
+    "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-typescript": "^12.1.2",
-    "rollup": "^4.34.9",
-    "rollup-plugin-dts": "^6.1.1",
+    "rollup": "^4.36.0",
+    "rollup-plugin-dts": "^6.2.0",
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
     "typescript": "^5.8.2",
@@ -58,6 +58,6 @@
     }
   },
   "dependencies": {
-    "openai": "^4.86.1"
+    "openai": "^4.88.0"
   }
 }