@kevisual/query 0.0.31 → 0.0.33

package/dist/query-adapter.js

@@ -80,7 +80,7 @@ const adapter = async (opts = {}, overloadOpts) => {
         }
         else if (isTextForContentType(contentType)) {
             return {
-                code: 200,
+                code: response.status,
                 status: response.status,
                 data: await response.text(), // 直接返回文本内容
             };

package/dist/query-browser.d.ts

@@ -112,29 +112,24 @@ type QueryOpts$1 = {
     adapter?: typeof adapter;
     [key: string]: any;
 } & AdapterOpts;
+type QueryOptions = {
+    url?: string;
+    adapter?: typeof adapter;
+    headers?: Record<string, string>;
+    timeout?: number;
+    isClient?: boolean;
+};
 type Data = {
     path?: string;
     key?: string;
     payload?: Record<string, any>;
     [key: string]: any;
 };
-type Result<S = any> = {
+type Result<S = any, U = {}> = {
     code: number;
     data?: S;
     message?: string;
-    success: boolean;
-    /**
-     * 是否不返回 message
-     */
-    noMsg?: boolean;
-    /**
-     * 显示错误, 当 handle的信息被处理的时候，如果不是success，同时自己设置了noMsg，那么就不显示错误信息了，因为被处理。
-     *
-     * 日常: fetch().then(res=>if(res.sucess){message.error('error')})的时候，比如401被处理过了，就不再提示401错误了。
-     *
-     */
-    showError: (fn?: () => void) => void;
-};
+} & U;
 type DataOpts = Partial<QueryOpts$1> & {
     beforeRequest?: Fn;
     afterResponse?: <S = any>(result: Result<S>, ctx?: {
@@ -184,7 +179,8 @@ declare class Query {
      */
     stop?: boolean;
     qws: QueryWs;
-    constructor(opts?: QueryOpts$1);
+    isClient: boolean;
+    constructor(opts?: QueryOptions);
     setQueryWs(qws: QueryWs): void;
     /**
      * 突然停止请求
@@ -221,6 +217,7 @@ declare class Query {
     fetchText(urlOrOptions?: string | QueryOpts$1, options?: QueryOpts$1): Promise<Result<any>>;
 }
 
+/** @deprecated */
 declare class BaseQuery<T extends Query = Query, R extends {
     queryChain?: any;
     query?: any;
@@ -239,6 +236,10 @@ declare class BaseQuery<T extends Query = Query, R extends {
     post<R = any, P = any>(data: P, options?: DataOpts): Promise<Result<R>>;
     get<R = any, P = any>(data: P, options?: DataOpts): Promise<Result<R>>;
 }
+/**
+ * @deprecated
+ * 前端调用后端QueryRouter, 默认路径 /client/router
+ */
 declare class ClientQuery extends Query {
     constructor(opts?: QueryOpts$1);
 }
@@ -248,6 +249,7 @@ type QueryOpts = {
     adapter?: typeof adapter;
     headers?: Record<string, string>;
     timeout?: number;
+    isClient?: boolean;
 };
 /**
  * 前端调用后端QueryRouter, 封装 beforeRequest 和 wss
@@ -256,7 +258,7 @@ declare class QueryClient extends Query {
     tokenName: string;
     storage: Storage;
     token: string;
-    constructor(opts?: QueryOpts & {
+    constructor(opts?: QueryOptions & {
         tokenName?: string;
         storage?: Storage;
         io?: boolean;
@@ -268,4 +270,4 @@ declare class QueryClient extends Query {
 }
 
 export { BaseQuery, ClientQuery, Query, QueryClient, QueryWs, adapter, wrapperError };
-export type { Data, DataOpts, QueryOpts, QueryWsOpts, Result };
+export type { Data, DataOpts, QueryOptions, QueryOpts, QueryWsOpts, Result };

package/dist/query-browser.js

@@ -79,7 +79,7 @@ const adapter = async (opts = {}, overloadOpts) => {
         }
         else if (isTextForContentType(contentType)) {
             return {
-                code: 200,
+                code: response.status,
                 status: response.status,
                 data: await response.text(), // 直接返回文本内容
             };
@@ -318,25 +318,6 @@ class QueryWs {
     }
 }
 
-/**
- * 设置基础响应, 设置 success 和 showError,
- * success 是 code 是否等于 200
- * showError 是 如果 success 为 false 且 noMsg 为 false, 则调用 showError
- * @param res 响应
- */
-const setBaseResponse = (res) => {
-    res.success = res.code === 200;
-    /**
-     * 显示错误
-     * @param fn 错误处理函数
-     */
-    res.showError = (fn) => {
-        if (!res.success && !res.noMsg) {
-            fn?.();
-        }
-    };
-    return res;
-};
 const wrapperError = ({ code, message }) => {
     const result = {
         code: code || 500,
@@ -377,9 +358,11 @@ class Query {
     stop;
     // 默认不使用ws
     qws;
+    isClient = false;
     constructor(opts) {
         this.adapter = opts?.adapter || adapter;
-        this.url = opts?.url || '/api/router';
+        const defaultURL = opts?.isClient ? '/client/router' : '/api/router';
+        this.url = opts?.url || defaultURL;
         this.headers = opts?.headers || {
             'Content-Type': 'application/json',
         };
@@ -465,7 +448,6 @@ class Query {
         }
         return _adapter(req).then(async (res) => {
             try {
-                setBaseResponse(res);
                 if (_afterResponse) {
                     return await _afterResponse(res, {
                         req,
@@ -513,9 +495,16 @@ class Query {
                 ...(_options?.headers || {}),
             },
         });
-        return setBaseResponse(res);
+        if (res && !res.code) {
+            return {
+                code: 200,
+                data: res,
+            };
+        }
+        return res;
     }
 }
+/** @deprecated */
 class BaseQuery {
     query;
     queryDefine;
@@ -541,6 +530,10 @@ class BaseQuery {
         return this.query.get(data, options);
     }
 }
+/**
+ * @deprecated
+ * 前端调用后端QueryRouter, 默认路径 /client/router
+ */
 class ClientQuery extends Query {
     constructor(opts) {
         super({ ...opts, url: opts?.url || '/client/router' });

package/dist/query.d.ts

@@ -112,29 +112,24 @@ type QueryOpts = {
     adapter?: typeof adapter;
     [key: string]: any;
 } & AdapterOpts;
+type QueryOptions = {
+    url?: string;
+    adapter?: typeof adapter;
+    headers?: Record<string, string>;
+    timeout?: number;
+    isClient?: boolean;
+};
 type Data = {
     path?: string;
     key?: string;
     payload?: Record<string, any>;
     [key: string]: any;
 };
-type Result<S = any> = {
+type Result<S = any, U = {}> = {
     code: number;
     data?: S;
     message?: string;
-    success: boolean;
-    /**
-     * 是否不返回 message
-     */
-    noMsg?: boolean;
-    /**
-     * 显示错误, 当 handle的信息被处理的时候，如果不是success，同时自己设置了noMsg，那么就不显示错误信息了，因为被处理。
-     *
-     * 日常: fetch().then(res=>if(res.sucess){message.error('error')})的时候，比如401被处理过了，就不再提示401错误了。
-     *
-     */
-    showError: (fn?: () => void) => void;
-};
+} & U;
 type DataOpts = Partial<QueryOpts> & {
     beforeRequest?: Fn;
     afterResponse?: <S = any>(result: Result<S>, ctx?: {
@@ -153,7 +148,11 @@ type DataOpts = Partial<QueryOpts> & {
  * showError 是 如果 success 为 false 且 noMsg 为 false, 则调用 showError
  * @param res 响应
  */
-declare const setBaseResponse: (res: Partial<Result>) => Result;
+declare const setBaseResponse: (res: Partial<Result & {
+    success?: boolean;
+    showError?: (fn?: () => void) => void;
+    noMsg?: boolean;
+}>) => Result;
 declare const wrapperError: ({ code, message }: {
     code?: number;
     message?: string;
@@ -191,7 +190,8 @@ declare class Query {
      */
     stop?: boolean;
     qws: QueryWs;
-    constructor(opts?: QueryOpts);
+    isClient: boolean;
+    constructor(opts?: QueryOptions);
     setQueryWs(qws: QueryWs): void;
     /**
      * 突然停止请求
@@ -228,6 +228,7 @@ declare class Query {
     fetchText(urlOrOptions?: string | QueryOpts, options?: QueryOpts): Promise<Result<any>>;
 }
 
+/** @deprecated */
 declare class BaseQuery<T extends Query = Query, R extends {
     queryChain?: any;
     query?: any;
@@ -246,9 +247,13 @@ declare class BaseQuery<T extends Query = Query, R extends {
     post<R = any, P = any>(data: P, options?: DataOpts): Promise<Result<R>>;
     get<R = any, P = any>(data: P, options?: DataOpts): Promise<Result<R>>;
 }
+/**
+ * @deprecated
+ * 前端调用后端QueryRouter, 默认路径 /client/router
+ */
 declare class ClientQuery extends Query {
     constructor(opts?: QueryOpts);
 }
 
 export { BaseQuery, ClientQuery, Query, adapter, setBaseResponse, wrapperError };
-export type { Data, DataOpts, Fn, QueryOpts, Result };
+export type { Data, DataOpts, Fn, QueryOptions, QueryOpts, Result };

package/dist/query.js

@@ -79,7 +79,7 @@ const adapter = async (opts = {}, overloadOpts) => {
         }
         else if (isTextForContentType(contentType)) {
             return {
-                code: 200,
+                code: response.status,
                 status: response.status,
                 data: await response.text(), // 直接返回文本内容
             };
@@ -161,9 +161,11 @@ class Query {
     stop;
     // 默认不使用ws
     qws;
+    isClient = false;
     constructor(opts) {
         this.adapter = opts?.adapter || adapter;
-        this.url = opts?.url || '/api/router';
+        const defaultURL = opts?.isClient ? '/client/router' : '/api/router';
+        this.url = opts?.url || defaultURL;
         this.headers = opts?.headers || {
             'Content-Type': 'application/json',
         };
@@ -249,7 +251,6 @@ class Query {
         }
         return _adapter(req).then(async (res) => {
             try {
-                setBaseResponse(res);
                 if (_afterResponse) {
                     return await _afterResponse(res, {
                         req,
@@ -297,9 +298,16 @@ class Query {
                 ...(_options?.headers || {}),
             },
         });
-        return setBaseResponse(res);
+        if (res && !res.code) {
+            return {
+                code: 200,
+                data: res,
+            };
+        }
+        return res;
     }
 }
+/** @deprecated */
 class BaseQuery {
     query;
     queryDefine;
@@ -325,6 +333,10 @@ class BaseQuery {
         return this.query.get(data, options);
     }
 }
+/**
+ * @deprecated
+ * 前端调用后端QueryRouter, 默认路径 /client/router
+ */
 class ClientQuery extends Query {
     constructor(opts) {
         super({ ...opts, url: opts?.url || '/client/router' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/query",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "main": "dist/query-browser.js",
   "private": false,
   "type": "module",
@@ -23,7 +23,7 @@
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
-    "rollup": "^4.53.3",
+    "rollup": "^4.53.5",
     "rollup-plugin-dts": "^6.3.0",
     "typescript": "^5.9.3",
     "zustand": "^5.0.9"
@@ -47,10 +47,6 @@
     "./ws": {
       "import": "./dist/query-ws.js",
       "require": "./dist/query-ws.js"
-    },
-    "./query-ai": {
-      "import": "./dist/query-ai.js",
-      "require": "./dist/query-ai.js"
     }
   }
 }