@kevisual/query 0.0.28 → 0.0.30

package/dist/query-adapter.d.ts

@@ -3,11 +3,26 @@ type Method = (typeof methods)[number];
 type AdapterOpts = {
     url?: string;
     headers?: Record<string, string>;
+    /**
+     * 只用户POST请求，传递的查询参数，
+     * GET请求默认方body自己转化为查询参数
+     */
+    params?: Record<string, any>;
     body?: Record<string, any> | FormData;
     timeout?: number;
     method?: Method;
+    /**
+     * @deprecated use responseType
+     */
     isBlob?: boolean;
+    /**
+     * @deprecated use responseType
+     */
     isText?: boolean;
+    /**
+     * 响应类型,
+     * */
+    responseType?: 'json' | 'text' | 'blob';
     isPostFile?: boolean;
 };
 declare const isTextForContentType: (contentType: string | null) => boolean;

package/dist/query-adapter.js

@@ -2,7 +2,7 @@ const methods = ['GET', 'POST'];
 const isTextForContentType = (contentType) => {
     if (!contentType)
         return false;
-    const textTypes = ['text/', 'xml', 'html', 'javascript', 'css', 'csv', 'plain', 'x-www-form-urlencoded'];
+    const textTypes = ['text/', 'xml', 'html', 'javascript', 'css', 'csv', 'plain', 'x-www-form-urlencoded', 'md'];
     return textTypes.some((type) => contentType.includes(type));
 };
 /**
@@ -14,9 +14,14 @@ const isTextForContentType = (contentType) => {
 const adapter = async (opts = {}, overloadOpts) => {
     const controller = new AbortController();
     const signal = controller.signal;
-    const isBlob = opts.isBlob || false; // 是否返回 Blob 对象
-    const isText = opts.isText || false; // 是否返回文本内容
     const isPostFile = opts.isPostFile || false; // 是否为文件上传
+    let responseType = opts.responseType || 'json'; // 响应类型
+    if (opts.isBlob) {
+        responseType = 'blob';
+    }
+    else if (opts.isText) {
+        responseType = 'text';
+    }
     const timeout = opts.timeout || 60000 * 3; // 默认超时时间为 60s * 3
     const timer = setTimeout(() => {
         controller.abort();
@@ -36,6 +41,10 @@ const adapter = async (opts = {}, overloadOpts) => {
     if (isGet) {
         url.search = new URLSearchParams(opts.body).toString();
     }
+    else {
+        const params = opts.params || {};
+        url.search = new URLSearchParams(params).toString();
+    }
     let body = undefined;
     if (isGet) {
         body = undefined;
@@ -60,9 +69,10 @@ const adapter = async (opts = {}, overloadOpts) => {
         .then(async (response) => {
         // 获取 Content-Type 头部信息
         const contentType = response.headers.get('Content-Type');
-        if (isBlob) {
+        if (responseType === 'blob') {
             return await response.blob(); // 直接返回 Blob 对象
         }
+        const isText = responseType === 'text';
         const isJson = contentType && contentType.includes('application/json');
         // 判断返回的数据类型
         if (isJson && !isText) {

package/dist/query-browser.d.ts

@@ -5,11 +5,26 @@ type Method = (typeof methods)[number];
 type AdapterOpts = {
     url?: string;
     headers?: Record<string, string>;
+    /**
+     * 只用户POST请求，传递的查询参数，
+     * GET请求默认方body自己转化为查询参数
+     */
+    params?: Record<string, any>;
     body?: Record<string, any> | FormData;
     timeout?: number;
     method?: Method;
+    /**
+     * @deprecated use responseType
+     */
     isBlob?: boolean;
+    /**
+     * @deprecated use responseType
+     */
     isText?: boolean;
+    /**
+     * 响应类型,
+     * */
+    responseType?: 'json' | 'text' | 'blob';
     isPostFile?: boolean;
 };
 /**
@@ -94,16 +109,9 @@ type Fn = (opts: {
     timeout?: number;
 }) => Promise<Record<string, any> | false>;
 type QueryOpts$1 = {
-    url?: string;
-    headers?: Record<string, string>;
-    body?: Record<string, any> | FormData;
-    timeout?: number;
-    method?: Method;
-    isBlob?: boolean;
-    isPostFile?: boolean;
     adapter?: typeof adapter;
     [key: string]: any;
-};
+} & AdapterOpts;
 type Data = {
     path?: string;
     key?: string;
@@ -134,6 +142,10 @@ type DataOpts = Partial<QueryOpts$1> & {
         res?: any;
         fetch?: any;
     }) => Promise<Result<S>>;
+    /**
+     * 是否在stop的时候不请求
+     */
+    noStop?: boolean;
 };
 declare const wrapperError: ({ code, message }: {
     code?: number;
@@ -157,7 +169,13 @@ declare const wrapperError: ({ code, message }: {
 declare class Query {
     adapter: typeof adapter;
     url: string;
+    /**
+     * 请求前处理函数
+     */
     beforeRequest?: DataOpts['beforeRequest'];
+    /**
+     *  请求后处理函数
+     */
     afterResponse?: DataOpts['afterResponse'];
     headers?: Record<string, string>;
     timeout?: number;
@@ -191,40 +209,18 @@ declare class Query {
      */
     post<R = any, P = any>(body: Data & P, options?: DataOpts): Promise<Result<R>>;
     /**
-     * 请求前处理，设置请求前处理函数
+     * 设置请求前处理，设置请求前处理函数
      * @param fn 处理函数
      */
     before(fn: DataOpts['beforeRequest']): void;
     /**
-     * 请求后处理，设置请求后处理函数
+     * 设置请求后处理，设置请求后处理函数
      * @param fn 处理函数
      */
     after(fn: DataOpts['afterResponse']): void;
     fetchText(urlOrOptions?: string | QueryOpts$1, options?: QueryOpts$1): Promise<Result<any>>;
 }
 
-declare class BaseQuery<T extends Query = Query, R extends {
-    queryChain?: any;
-    query?: any;
-} = {
-    queryChain: any;
-    query?: T;
-}> {
-    query: T;
-    queryDefine: R;
-    constructor(opts?: {
-        query?: T;
-        queryDefine?: R;
-        clientQuery?: T;
-    });
-    get chain(): R['queryChain'];
-    post<R = any, P = any>(data: P, options?: DataOpts): Promise<Result<R>>;
-    get<R = any, P = any>(data: P, options?: DataOpts): Promise<Result<R>>;
-}
-declare class ClientQuery extends Query {
-    constructor(opts?: QueryOpts$1);
-}
-
 type QueryOpts = {
     url?: string;
     adapter?: typeof adapter;
@@ -249,5 +245,5 @@ declare class QueryClient extends Query {
     removeToken(): void;
 }
 
-export { BaseQuery, ClientQuery, Query, QueryClient, QueryWs, adapter, wrapperError };
+export { Query, QueryClient, QueryWs, adapter, wrapperError };
 export type { Data, DataOpts, QueryOpts, QueryWsOpts, Result };

package/dist/query-browser.js

@@ -1,7 +1,7 @@
 const isTextForContentType = (contentType) => {
     if (!contentType)
         return false;
-    const textTypes = ['text/', 'xml', 'html', 'javascript', 'css', 'csv', 'plain', 'x-www-form-urlencoded'];
+    const textTypes = ['text/', 'xml', 'html', 'javascript', 'css', 'csv', 'plain', 'x-www-form-urlencoded', 'md'];
     return textTypes.some((type) => contentType.includes(type));
 };
 /**
@@ -13,9 +13,14 @@ const isTextForContentType = (contentType) => {
 const adapter = async (opts = {}, overloadOpts) => {
     const controller = new AbortController();
     const signal = controller.signal;
-    const isBlob = opts.isBlob || false; // 是否返回 Blob 对象
-    const isText = opts.isText || false; // 是否返回文本内容
     const isPostFile = opts.isPostFile || false; // 是否为文件上传
+    let responseType = opts.responseType || 'json'; // 响应类型
+    if (opts.isBlob) {
+        responseType = 'blob';
+    }
+    else if (opts.isText) {
+        responseType = 'text';
+    }
     const timeout = opts.timeout || 60000 * 3; // 默认超时时间为 60s * 3
     const timer = setTimeout(() => {
         controller.abort();
@@ -35,6 +40,10 @@ const adapter = async (opts = {}, overloadOpts) => {
     if (isGet) {
         url.search = new URLSearchParams(opts.body).toString();
     }
+    else {
+        const params = opts.params || {};
+        url.search = new URLSearchParams(params).toString();
+    }
     let body = undefined;
     if (isGet) {
         body = undefined;
@@ -59,9 +68,10 @@ const adapter = async (opts = {}, overloadOpts) => {
         .then(async (response) => {
         // 获取 Content-Type 头部信息
         const contentType = response.headers.get('Content-Type');
-        if (isBlob) {
+        if (responseType === 'blob') {
             return await response.blob(); // 直接返回 Blob 对象
         }
+        const isText = responseType === 'text';
         const isJson = contentType && contentType.includes('application/json');
         // 判断返回的数据类型
         if (isJson && !isText) {
@@ -113,7 +123,7 @@ const createStoreImpl = (createState) => {
   const initialState = state = createState(setState, getState, api);
   return api;
 };
-const createStore = (createState) => createState ? createStoreImpl(createState) : createStoreImpl;
+const createStore = ((createState) => createState ? createStoreImpl(createState) : createStoreImpl);
 
 const parseWsUrl = (url) => {
     try {
@@ -351,7 +361,13 @@ const wrapperError = ({ code, message }) => {
 class Query {
     adapter;
     url;
+    /**
+     * 请求前处理函数
+     */
     beforeRequest;
+    /**
+     *  请求后处理函数
+     */
     afterResponse;
     headers;
     timeout;
@@ -431,7 +447,7 @@ class Query {
                 code: 500,
                 message: 'api request beforeFn error'});
         }
-        if (this.stop) {
+        if (this.stop && !options?.noStop) {
             const that = this;
             await new Promise((resolve) => {
                 let timer = 0;
@@ -468,14 +484,14 @@ class Query {
         });
     }
     /**
-     * 请求前处理，设置请求前处理函数
+     * 设置请求前处理，设置请求前处理函数
      * @param fn 处理函数
      */
     before(fn) {
         this.beforeRequest = fn;
     }
     /**
-     * 请求后处理，设置请求后处理函数
+     * 设置请求后处理，设置请求后处理函数
      * @param fn 处理函数
      */
     after(fn) {
@@ -500,36 +516,6 @@ class Query {
         return setBaseResponse(res);
     }
 }
-class BaseQuery {
-    query;
-    queryDefine;
-    constructor(opts) {
-        if (opts?.clientQuery) {
-            this.query = opts.clientQuery;
-        }
-        else {
-            this.query = opts?.query;
-        }
-        if (opts.queryDefine) {
-            this.queryDefine = opts.queryDefine;
-            this.queryDefine.query = this.query;
-        }
-    }
-    get chain() {
-        return this.queryDefine.queryChain;
-    }
-    post(data, options) {
-        return this.query.post(data, options);
-    }
-    get(data, options) {
-        return this.query.get(data, options);
-    }
-}
-class ClientQuery extends Query {
-    constructor(opts) {
-        super({ ...opts, url: opts?.url || '/client/router' });
-    }
-}
 
 /**
  * 前端调用后端QueryRouter, 封装 beforeRequest 和 wss
@@ -572,4 +558,4 @@ class QueryClient extends Query {
 // 移除默认生成的实例
 // export const client = new QueryClient();
 
-export { BaseQuery, ClientQuery, Query, QueryClient, QueryWs, adapter, wrapperError };
+export { Query, QueryClient, QueryWs, adapter, wrapperError };

package/dist/query-ws.js

@@ -19,7 +19,7 @@ const createStoreImpl = (createState) => {
   const initialState = state = createState(setState, getState, api);
   return api;
 };
-const createStore = (createState) => createState ? createStoreImpl(createState) : createStoreImpl;
+const createStore = ((createState) => createState ? createStoreImpl(createState) : createStoreImpl);
 
 const parseWsUrl = (url) => {
     try {

package/dist/query.d.ts

@@ -5,11 +5,26 @@ type Method = (typeof methods)[number];
 type AdapterOpts = {
     url?: string;
     headers?: Record<string, string>;
+    /**
+     * 只用户POST请求，传递的查询参数，
+     * GET请求默认方body自己转化为查询参数
+     */
+    params?: Record<string, any>;
     body?: Record<string, any> | FormData;
     timeout?: number;
     method?: Method;
+    /**
+     * @deprecated use responseType
+     */
     isBlob?: boolean;
+    /**
+     * @deprecated use responseType
+     */
     isText?: boolean;
+    /**
+     * 响应类型,
+     * */
+    responseType?: 'json' | 'text' | 'blob';
     isPostFile?: boolean;
 };
 /**
@@ -94,16 +109,9 @@ type Fn = (opts: {
     timeout?: number;
 }) => Promise<Record<string, any> | false>;
 type QueryOpts = {
-    url?: string;
-    headers?: Record<string, string>;
-    body?: Record<string, any> | FormData;
-    timeout?: number;
-    method?: Method;
-    isBlob?: boolean;
-    isPostFile?: boolean;
     adapter?: typeof adapter;
     [key: string]: any;
-};
+} & AdapterOpts;
 type Data = {
     path?: string;
     key?: string;
@@ -134,6 +142,10 @@ type DataOpts = Partial<QueryOpts> & {
         res?: any;
         fetch?: any;
     }) => Promise<Result<S>>;
+    /**
+     * 是否在stop的时候不请求
+     */
+    noStop?: boolean;
 };
 /**
  * 设置基础响应, 设置 success 和 showError,
@@ -164,7 +176,13 @@ declare const wrapperError: ({ code, message }: {
 declare class Query {
     adapter: typeof adapter;
     url: string;
+    /**
+     * 请求前处理函数
+     */
     beforeRequest?: DataOpts['beforeRequest'];
+    /**
+     *  请求后处理函数
+     */
     afterResponse?: DataOpts['afterResponse'];
     headers?: Record<string, string>;
     timeout?: number;
@@ -198,39 +216,17 @@ declare class Query {
      */
     post<R = any, P = any>(body: Data & P, options?: DataOpts): Promise<Result<R>>;
     /**
-     * 请求前处理，设置请求前处理函数
+     * 设置请求前处理，设置请求前处理函数
      * @param fn 处理函数
      */
     before(fn: DataOpts['beforeRequest']): void;
     /**
-     * 请求后处理，设置请求后处理函数
+     * 设置请求后处理，设置请求后处理函数
      * @param fn 处理函数
      */
     after(fn: DataOpts['afterResponse']): void;
     fetchText(urlOrOptions?: string | QueryOpts, options?: QueryOpts): Promise<Result<any>>;
 }
 
-declare class BaseQuery<T extends Query = Query, R extends {
-    queryChain?: any;
-    query?: any;
-} = {
-    queryChain: any;
-    query?: T;
-}> {
-    query: T;
-    queryDefine: R;
-    constructor(opts?: {
-        query?: T;
-        queryDefine?: R;
-        clientQuery?: T;
-    });
-    get chain(): R['queryChain'];
-    post<R = any, P = any>(data: P, options?: DataOpts): Promise<Result<R>>;
-    get<R = any, P = any>(data: P, options?: DataOpts): Promise<Result<R>>;
-}
-declare class ClientQuery extends Query {
-    constructor(opts?: QueryOpts);
-}
-
-export { BaseQuery, ClientQuery, Query, adapter, setBaseResponse, wrapperError };
+export { Query, adapter, setBaseResponse, wrapperError };
 export type { Data, DataOpts, Fn, QueryOpts, Result };

package/dist/query.js

@@ -1,7 +1,7 @@
 const isTextForContentType = (contentType) => {
     if (!contentType)
         return false;
-    const textTypes = ['text/', 'xml', 'html', 'javascript', 'css', 'csv', 'plain', 'x-www-form-urlencoded'];
+    const textTypes = ['text/', 'xml', 'html', 'javascript', 'css', 'csv', 'plain', 'x-www-form-urlencoded', 'md'];
     return textTypes.some((type) => contentType.includes(type));
 };
 /**
@@ -13,9 +13,14 @@ const isTextForContentType = (contentType) => {
 const adapter = async (opts = {}, overloadOpts) => {
     const controller = new AbortController();
     const signal = controller.signal;
-    const isBlob = opts.isBlob || false; // 是否返回 Blob 对象
-    const isText = opts.isText || false; // 是否返回文本内容
     const isPostFile = opts.isPostFile || false; // 是否为文件上传
+    let responseType = opts.responseType || 'json'; // 响应类型
+    if (opts.isBlob) {
+        responseType = 'blob';
+    }
+    else if (opts.isText) {
+        responseType = 'text';
+    }
     const timeout = opts.timeout || 60000 * 3; // 默认超时时间为 60s * 3
     const timer = setTimeout(() => {
         controller.abort();
@@ -35,6 +40,10 @@ const adapter = async (opts = {}, overloadOpts) => {
     if (isGet) {
         url.search = new URLSearchParams(opts.body).toString();
     }
+    else {
+        const params = opts.params || {};
+        url.search = new URLSearchParams(params).toString();
+    }
     let body = undefined;
     if (isGet) {
         body = undefined;
@@ -59,9 +68,10 @@ const adapter = async (opts = {}, overloadOpts) => {
         .then(async (response) => {
         // 获取 Content-Type 头部信息
         const contentType = response.headers.get('Content-Type');
-        if (isBlob) {
+        if (responseType === 'blob') {
             return await response.blob(); // 直接返回 Blob 对象
         }
+        const isText = responseType === 'text';
         const isJson = contentType && contentType.includes('application/json');
         // 判断返回的数据类型
         if (isJson && !isText) {
@@ -135,7 +145,13 @@ const wrapperError = ({ code, message }) => {
 class Query {
     adapter;
     url;
+    /**
+     * 请求前处理函数
+     */
     beforeRequest;
+    /**
+     *  请求后处理函数
+     */
     afterResponse;
     headers;
     timeout;
@@ -215,7 +231,7 @@ class Query {
                 code: 500,
                 message: 'api request beforeFn error'});
         }
-        if (this.stop) {
+        if (this.stop && !options?.noStop) {
             const that = this;
             await new Promise((resolve) => {
                 let timer = 0;
@@ -252,14 +268,14 @@ class Query {
         });
     }
     /**
-     * 请求前处理，设置请求前处理函数
+     * 设置请求前处理，设置请求前处理函数
      * @param fn 处理函数
      */
     before(fn) {
         this.beforeRequest = fn;
     }
     /**
-     * 请求后处理，设置请求后处理函数
+     * 设置请求后处理，设置请求后处理函数
      * @param fn 处理函数
      */
     after(fn) {
@@ -284,35 +300,5 @@ class Query {
         return setBaseResponse(res);
     }
 }
-class BaseQuery {
-    query;
-    queryDefine;
-    constructor(opts) {
-        if (opts?.clientQuery) {
-            this.query = opts.clientQuery;
-        }
-        else {
-            this.query = opts?.query;
-        }
-        if (opts.queryDefine) {
-            this.queryDefine = opts.queryDefine;
-            this.queryDefine.query = this.query;
-        }
-    }
-    get chain() {
-        return this.queryDefine.queryChain;
-    }
-    post(data, options) {
-        return this.query.post(data, options);
-    }
-    get(data, options) {
-        return this.query.get(data, options);
-    }
-}
-class ClientQuery extends Query {
-    constructor(opts) {
-        super({ ...opts, url: opts?.url || '/client/router' });
-    }
-}
 
-export { BaseQuery, ClientQuery, Query, adapter, setBaseResponse, wrapperError };
+export { Query, adapter, setBaseResponse, wrapperError };

package/package.json

@@ -1,9 +1,7 @@
 {
   "name": "@kevisual/query",
-  "version": "0.0.28",
-  "main": "dist/index.js",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "version": "0.0.30",
+  "main": "dist/query-browser.js",
   "private": false,
   "type": "module",
   "scripts": {
@@ -23,16 +21,13 @@
   "license": "ISC",
   "description": "",
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "^16.0.1",
-    "@rollup/plugin-typescript": "^12.1.2",
-    "rollup": "^4.41.1",
-    "rollup-plugin-dts": "^6.2.1",
-    "ts-node": "^10.9.2",
-    "tslib": "^2.8.1",
-    "typescript": "^5.8.3",
-    "zustand": "^5.0.5"
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@rollup/plugin-typescript": "^12.3.0",
+    "rollup": "^4.53.3",
+    "rollup-plugin-dts": "^6.3.0",
+    "typescript": "^5.9.3",
+    "zustand": "^5.0.9"
   },
-  "packageManager": "yarn@1.22.22",
   "publishConfig": {
     "access": "public"
   },
@@ -57,8 +52,5 @@
       "import": "./dist/query-ai.js",
       "require": "./dist/query-ai.js"
     }
-  },
-  "dependencies": {
-    "openai": "^5.0.1"
   }
 }

package/dist/query-ai.d.ts

@@ -1,30 +0,0 @@
-import OpenAI, { ClientOptions } from 'openai';
-export { default as OpenAI } from 'openai';
-import { RequestOptions } from 'openai/core.mjs';
-
-type QueryOpts = {
-    /**
-     * OpenAI model name, example: deepseek-chat
-     */
-    model: string;
-    /**
-     * OpenAI client options
-     * QueryAi.init() will be called with these options
-     */
-    openAiOpts?: ClientOptions;
-    openai?: OpenAI;
-};
-declare class QueryAI {
-    private openai;
-    model?: string;
-    constructor(opts?: QueryOpts);
-    init(opts: ClientOptions): void;
-    query(prompt: string, opts?: RequestOptions): Promise<OpenAI.Chat.Completions.ChatCompletion & {
-        _request_id?: string | null;
-    }>;
-    queryAsync(prompt: string, opts?: RequestOptions): Promise<OpenAI.Chat.Completions.ChatCompletion & {
-        _request_id?: string | null;
-    }>;
-}
-
-export { QueryAI };