@kevisual/query 0.0.46 → 0.0.48

package/src/query-api.ts

@@ -64,18 +64,27 @@ type InferType<T> =
   T extends { properties: infer P } ? InferFromJSONSchema<T> : // 处理没有 type 但有 properties 的对象
   T;
 
+// 检查是否标记为可选
+type IsOptional<T> = T extends { optional: true } ? true : false;
+
 // 提取 args 对象，将每个 Zod schema 或 JSON Schema 转换为实际类型
+// 根据 optional 字段分离必需字段和可选字段
 type ExtractArgsFromMetadata<T> = T extends { metadata?: { args?: infer A } }
   ? A extends Record<string, any>
-  ? { [K in keyof A]: InferType<A[K]> }
-  : never
+    ? (
+        // 必需字段（没有 optional: true）
+        { [K in keyof A as IsOptional<A[K]> extends true ? never : K]: InferType<A[K]> } &
+        // 可选字段（有 optional: true）
+        { [K in keyof A as IsOptional<A[K]> extends true ? K : never]?: InferType<A[K]> }
+      )
+    : never
   : never;
 
 // 类型映射：将 API 配置转换为方法签名
 type ApiMethods<P extends { [path: string]: { [key: string]: Pos } }> = {
   [Path in keyof P]: {
     [Key in keyof P[Path]]: (
-      data?: Partial<ExtractArgsFromMetadata<P[Path][Key]>>,
+      data?: ExtractArgsFromMetadata<P[Path][Key]>,
       opts?: DataOpts
     ) => ReturnType<Query['post']>
   }
@@ -97,7 +106,7 @@ export class QueryApi<P extends { [path: string]: { [key: string]: Pos } } = {}>
   // 使用泛型来推断类型
   post<T extends Pos>(
     pos: T,
-    data?: Partial<ExtractArgsFromMetadata<T>>,
+    data?: ExtractArgsFromMetadata<T>,
     opts?: DataOpts
   ) {
     const _pos = pick(pos, ['path', 'key', 'id']);
@@ -121,8 +130,11 @@ export class QueryApi<P extends { [path: string]: { [key: string]: Pos } } = {}>
       }
 
       for (const [key, pos] of Object.entries(methods)) {
-        that[path][key] = (data?: Partial<ExtractArgsFromMetadata<typeof pos>>, opts?: DataOpts) => {
+        that[path][key] = (data?: ExtractArgsFromMetadata<typeof pos>, opts: DataOpts = {}) => {
           const _pos = pick(pos, ['path', 'key', 'id']);
+          if (pos.metadata?.viewItem?.api?.url && !opts.url) {
+            opts.url = pos.metadata.viewItem.api.url;
+          }
           return that.query.post({
             ..._pos,
             payload: data

package/src/query-browser.ts

@@ -19,23 +19,8 @@ type QueryOpts = {
  * 前端调用后端QueryRouter, 封装 beforeRequest 和 wss
  */
 export class QueryClient extends Query {
-  tokenName: string;
-  storage: Storage;
-  token: string;
-  constructor(opts?: QueryOptions & { tokenName?: string; storage?: Storage; io?: boolean }) {
+  constructor(opts?: QueryOptions & { io?: boolean }) {
     super(opts);
-    this.tokenName = opts?.tokenName || 'token';
-    this.storage = opts?.storage || globalThis.localStorage;
-    this.beforeRequest = async (opts) => {
-      const token = this.token || this.getToken();
-      if (token) {
-        opts.headers = {
-          ...opts.headers,
-          Authorization: `Bearer ${token}`,
-        };
-      }
-      return opts;
-    };
     if (opts?.io) {
       this.createWs();
     }
@@ -43,15 +28,6 @@ export class QueryClient extends Query {
   createWs(opts?: QueryWsOpts) {
     this.qws = new QueryWs({ url: this.url, ...opts });
   }
-  getToken() {
-    return this.storage.getItem(this.tokenName);
-  }
-  saveToken(token: string) {
-    this.storage.setItem(this.tokenName, token);
-  }
-  removeToken() {
-    this.storage.removeItem(this.tokenName);
-  }
 }
 // 移除默认生成的实例
 // export const client = new QueryClient();

package/src/query.ts

@@ -24,6 +24,8 @@ export type QueryOptions = {
   headers?: Record<string, string>;
   timeout?: number;
   isClient?: boolean;
+  tokenName?: string;
+  storage?: Storage;
   beforeRequest?: Fn;
 }
 export type Data = {
@@ -46,34 +48,11 @@ export type DataOpts = Partial<QueryOpts> & {
    */
   noStop?: boolean;
 };
-/**
- * 设置基础响应, 设置 success 和 showError,
- * success 是 code 是否等于 200
- * showError 是 如果 success 为 false 且 noMsg 为 false, 则调用 showError
- * @param res 响应
- */
-export const setBaseResponse = (res: Partial<Result & { success?: boolean; showError?: (fn?: () => void) => void; noMsg?: boolean }>) => {
-  res.success = res.code === 200;
-  /**
-   * 显示错误
-   * @param fn 错误处理函数
-   */
-  res.showError = (fn?: () => void) => {
-    if (!res.success && !res.noMsg) {
-      fn?.();
-    }
-  };
-  return res as Result;
-};
+
 export const wrapperError = ({ code, message }: { code?: number; message?: string }) => {
   const result = {
     code: code || 500,
-    success: false,
-    message: message || 'api request error',
-    showError: (fn?: () => void) => {
-      //
-    },
-    noMsg: true,
+    message: message || '请求错误'
   };
   return result;
 };
@@ -105,12 +84,13 @@ export class Query {
   stop?: boolean;
   // 默认不使用ws
   qws: QueryWs;
-  /**
-   * 默认是 /client/router或者 默认是 /api/router
-   */
-  isClient = false;
+  tokenName: string;
+  storage: Storage;
+  token: string;
   constructor(opts?: QueryOptions) {
     this.adapter = opts?.adapter || adapter;
+    this.tokenName = opts?.tokenName || 'token';
+    this.storage = opts?.storage || globalThis?.localStorage;
     const defaultURL = opts?.isClient ? '/client/router' : '/api/router';
     this.url = opts?.url || defaultURL;
     this.headers = opts?.headers || {
@@ -121,7 +101,7 @@ export class Query {
       this.beforeRequest = opts.beforeRequest;
     } else {
       this.beforeRequest = async (opts) => {
-        const token = globalThis?.localStorage?.getItem('token');
+        const token = this.token || this.storage?.getItem?.(this.tokenName);
         if (token) {
           opts.headers = {
             ...opts.headers,
@@ -162,7 +142,6 @@ export class Query {
    */
   async post<R = any, P = any>(body: Data & P, options?: DataOpts): Promise<Result<R>> {
     const url = options?.url || this.url;
-    console.log('query post', url, body, options);
     const { headers, adapter, beforeRequest, afterResponse, timeout, ...rest } = options || {};
     const _headers = { ...this.headers, ...headers };
     const _adapter = adapter || this.adapter;
@@ -182,7 +161,7 @@ export class Query {
         if (res === false) {
           return wrapperError({
             code: 500,
-            message: 'request is cancel',
+            message: '请求取消',
             // @ts-ignore
             req: req,
           });
@@ -192,14 +171,14 @@ export class Query {
       console.error('request beforeFn error', e, req);
       return wrapperError({
         code: 500,
-        message: 'api request beforeFn error',
+        message: '请求在请求前处理时发生错误',
         // @ts-ignore
         req: req,
       });
     }
     if (this.stop && !options?.noStop) {
       const that = this;
-      await new Promise((resolve) => {
+      const res = await new Promise((resolve) => {
         let timer = 0;
         const detect = setInterval(() => {
           if (!that.stop) {
@@ -207,11 +186,21 @@ export class Query {
             resolve(true);
           }
           timer++;
-          if (timer > 30) {
-            console.error('request stop: timeout', req.url, timer);
+          if (timer > 5) {
+            console.error('等待请求失败：', req.url, timer);
+            clearInterval(detect);
+            resolve(false);
           }
         }, 1000);
       });
+      if (!res) {
+        return wrapperError({
+          code: 500,
+          message: '请求取消，可能是因为用户未登录或者token过期',
+          // @ts-ignore
+          req: req,
+        });
+      }
     }
     return _adapter(req).then(async (res) => {
       try {
@@ -225,10 +214,10 @@ export class Query {
 
         return res;
       } catch (e) {
-        console.error('request afterFn error', e, req);
+        console.error('请求在响应后处理时发生错误', e, req);
         return wrapperError({
           code: 500,
-          message: 'api request afterFn error',
+          message: '请求在响应后处理时发生错误',
           // @ts-ignore
           req: req,
         });