@kevisual/query 0.0.53 → 0.0.55

package/dist/query-browser.d.ts

@@ -102,7 +102,6 @@ type Fn = (opts: {
 }) => Promise<Record<string, any> | false>;
 type QueryOpts$1 = {
     adapter?: typeof adapter;
-    token?: string;
     [key: string]: any;
 } & AdapterOpts;
 type QueryOptions = {

package/dist/query-browser.js

@@ -109,7 +109,7 @@ var adapter = async (opts = {}, overloadOpts) => {
   });
 };
 
-// node_modules/.pnpm/zustand@5.0.11/node_modules/zustand/esm/vanilla.mjs
+// ../../node_modules/.pnpm/zustand@5.0.12_@types+react@19.2.14_react@19.2.4_use-sync-external-store@1.6.0_react@19.2.4_/node_modules/zustand/esm/vanilla.mjs
 var createStoreImpl = (createState) => {
   let state;
   const listeners = /* @__PURE__ */ new Set;
@@ -400,10 +400,6 @@ class Query {
           });
         }
       }
-      const headers2 = req.headers || {};
-      if (options?.token && !headers2["Authorization"]) {
-        headers2["Authorization"] = `Bearer ${options.token}`;
-      }
     } catch (e) {
       console.error("request beforeFn error", e, req);
       return wrapperError({
@@ -464,20 +460,20 @@ class Query {
     this.afterResponse = fn;
   }
   async fetchText(urlOrOptions, options) {
-    let _options = { method: "GET", ...options };
+    let _options = { ...options };
     if (typeof urlOrOptions === "string" && !_options.url) {
       _options.url = urlOrOptions;
     }
     if (typeof urlOrOptions === "object") {
       _options = { ...urlOrOptions, ..._options };
     }
-    const headers = { ...this.headers, ..._options.headers };
-    if (options?.token && !headers["Authorization"] && _options.method !== "GET") {
-      headers["Authorization"] = `Bearer ${options.token}`;
-    }
     const res = await adapter({
+      method: "GET",
       ..._options,
-      headers
+      headers: {
+        ...this.headers,
+        ..._options?.headers || {}
+      }
     });
     if (res && !res.code) {
       return {

package/dist/query-ws.js

@@ -1,4 +1,4 @@
-// node_modules/.pnpm/zustand@5.0.11/node_modules/zustand/esm/vanilla.mjs
+// ../../node_modules/.pnpm/zustand@5.0.12_@types+react@19.2.14_react@19.2.4_use-sync-external-store@1.6.0_react@19.2.4_/node_modules/zustand/esm/vanilla.mjs
 var createStoreImpl = (createState) => {
   let state;
   const listeners = /* @__PURE__ */ new Set;

package/dist/query.d.ts

@@ -102,7 +102,6 @@ type Fn = (opts: {
 }) => Promise<Record<string, any> | false>;
 type QueryOpts = {
     adapter?: typeof adapter;
-    token?: string;
     [key: string]: any;
 } & AdapterOpts;
 type QueryOptions = {

package/dist/query.js

@@ -203,10 +203,6 @@ class Query {
           });
         }
       }
-      const headers2 = req.headers || {};
-      if (options?.token && !headers2["Authorization"]) {
-        headers2["Authorization"] = `Bearer ${options.token}`;
-      }
     } catch (e) {
       console.error("request beforeFn error", e, req);
       return wrapperError({
@@ -267,20 +263,20 @@ class Query {
     this.afterResponse = fn;
   }
   async fetchText(urlOrOptions, options) {
-    let _options = { method: "GET", ...options };
+    let _options = { ...options };
     if (typeof urlOrOptions === "string" && !_options.url) {
       _options.url = urlOrOptions;
     }
     if (typeof urlOrOptions === "object") {
       _options = { ...urlOrOptions, ..._options };
     }
-    const headers = { ...this.headers, ..._options.headers };
-    if (options?.token && !headers["Authorization"] && _options.method !== "GET") {
-      headers["Authorization"] = `Bearer ${options.token}`;
-    }
     const res = await adapter({
+      method: "GET",
       ..._options,
-      headers
+      headers: {
+        ...this.headers,
+        ..._options?.headers || {}
+      }
     });
     if (res && !res.code) {
       return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/query",
-  "version": "0.0.53",
+  "version": "0.0.55",
   "type": "module",
   "scripts": {
     "build": "npm run clean && bun run bun.config.ts",
@@ -19,12 +19,12 @@
   "description": "",
   "devDependencies": {
     "@kevisual/code-builder": "^0.0.6",
-    "@kevisual/router": "^0.0.85",
-    "@types/node": "^25.3.5",
+    "@kevisual/router": "^0.1.6",
+    "@types/node": "^25.5.0",
     "typescript": "^5.9.3",
     "es-toolkit": "^1.45.1",
     "zod": "^4.3.6",
-    "zustand": "^5.0.11"
+    "zustand": "^5.0.12"
   },
   "publishConfig": {
     "access": "public"

package/src/create-query/index.ts

@@ -8,6 +8,7 @@ type RouteInfo = {
   metadata?: {
     summary?: string;
     args?: Record<string, any>;
+    returns?: Record<string, any>;
     viewItem?: {
       type?: string;
       api?: {
@@ -46,12 +47,17 @@ const removeViewItemCotnextFromRoutes = (list: RouteInfo[], options?: CreateQuer
 }
 type CreateQueryOptions = {
   removeViewItem?: boolean,
+  removeId?: boolean,
   before?: string,
   after?: string,
 }
 export const createQueryByRoutes = (list: RouteInfo[], options?: CreateQueryOptions) => {
   const obj: any = {};
   list = removeViewItemCotnextFromRoutes(list, options);
+  list = options?.removeId ? list.map(route => {
+    const { id, ...rest } = route;
+    return rest as RouteInfo;
+  }) : list;
   for (const route of list) {
     if (!obj[route.path]) {
       obj[route.path] = {};
@@ -64,6 +70,14 @@ export const createQueryByRoutes = (list: RouteInfo[], options?: CreateQueryOpti
         route.metadata.args = toJSONSchema(jsonSchema);
       }
     }
+    if (route.metadata?.returns) {
+      const returns = route.metadata.returns;
+      if (returns?.$schema) {
+        // 将 returns 转换为 JSON Schema
+        const jsonSchema = fromJSONSchema(returns);
+        route.metadata.returns = toJSONSchema(jsonSchema);
+      }
+    }
     obj[route.path][route.key] = route;
   }
   const before = options?.before || `import { createQueryApi } from '@kevisual/query/api';`;

package/src/query.ts

@@ -1,4 +1,4 @@
-import { adapter, Method, AdapterOpts, methods } from './adapter.ts';
+import { adapter, Method, AdapterOpts } from './adapter.ts';
 import type { QueryWs } from './ws.ts';
 /**
  * 请求前处理函数
@@ -15,7 +15,6 @@ export type Fn = (opts: {
 
 export type QueryOpts = {
   adapter?: typeof adapter;
-  token?: string;
   [key: string]: any;
 } & AdapterOpts;
 
@@ -156,7 +155,6 @@ export class Query {
     const _beforeRequest = beforeRequest || this.beforeRequest;
     const _afterResponse = afterResponse || this.afterResponse;
     const _timeout = timeout || this.timeout;
-
     const req = {
       url: url,
       headers: _headers,
@@ -184,10 +182,6 @@ export class Query {
           });
         }
       }
-      const headers = req.headers || {};
-      if (options?.token && !headers['Authorization']) {
-        headers['Authorization'] = `Bearer ${options.token}`;
-      }
     } catch (e) {
       console.error('request beforeFn error', e, req);
       return wrapperError({
@@ -260,20 +254,20 @@ export class Query {
     this.afterResponse = fn;
   }
   async fetchText(urlOrOptions?: string | QueryOpts, options?: QueryOpts): Promise<Result<any>> {
-    let _options = { method: 'GET' as const, ...options };
+    let _options = { ...options };
     if (typeof urlOrOptions === 'string' && !_options.url) {
       _options.url = urlOrOptions;
     }
     if (typeof urlOrOptions === 'object') {
       _options = { ...urlOrOptions, ..._options };
     }
-    const headers = { ...this.headers, ..._options.headers };
-    if (options?.token && !headers['Authorization'] && _options.method !== 'GET') {
-      headers['Authorization'] = `Bearer ${options.token}`;
-    }
     const res = await adapter({
+      method: 'GET',
       ..._options,
-      headers,
+      headers: {
+        ...this.headers,
+        ...(_options?.headers || {}),
+      },
     });
     if (res && !res.code) {
       return {