@kevisual/query 0.0.48 → 0.0.50

package/dist/query-api.d.ts

@@ -107,13 +107,14 @@ type QueryOpts = {
 } & AdapterOpts;
 type QueryOptions = {
     url?: string;
+    baseURL?: string;
+    beforeRequest?: Fn;
     adapter?: typeof adapter;
     headers?: Record<string, string>;
     timeout?: number;
     isClient?: boolean;
     tokenName?: string;
     storage?: Storage;
-    beforeRequest?: Fn;
 };
 type Data = {
     path?: string;
@@ -149,6 +150,7 @@ type DataOpts = Partial<QueryOpts> & {
  */
 declare class Query {
     adapter: typeof adapter;
+    baseURL: string;
     url: string;
     /**
      * 请求前处理函数
@@ -227,7 +229,12 @@ type RouteInfo = {
         };
     };
 };
-declare const createQueryByRoutes: (list: RouteInfo[]) => string;
+type CreateQueryOptions = {
+    removeViewItem?: boolean;
+    before?: string;
+    after?: string;
+};
+declare const createQueryByRoutes: (list: RouteInfo[], options?: CreateQueryOptions) => string;
 
 type Pos = {
     path?: string;
@@ -309,7 +316,7 @@ type ApiMethods<P extends {
     };
 }> = {
     [Path in keyof P]: {
-        [Key in keyof P[Path]]: (data?: ExtractArgsFromMetadata<P[Path][Key]>, opts?: DataOpts) => ReturnType<Query['post']>;
+        [Key in keyof P[Path]]: <T = any>(data?: ExtractArgsFromMetadata<P[Path][Key]>, opts?: DataOpts) => Promise<Result<T>>;
     };
 };
 type QueryApiOpts<P extends {

package/dist/query-api.js

@@ -120,6 +120,7 @@ var wrapperError = ({ code, message }) => {
 
 class Query {
   adapter;
+  baseURL;
   url;
   beforeRequest;
   afterResponse;
@@ -136,6 +137,11 @@ class Query {
     this.storage = opts?.storage || globalThis?.localStorage;
     const defaultURL = opts?.isClient ? "/client/router" : "/api/router";
     this.url = opts?.url || defaultURL;
+    if (this.url.startsWith("http")) {
+      const urlObj = new URL(this.url);
+      this.baseURL = urlObj.origin;
+    }
+    this.baseURL = opts?.baseURL || this.baseURL;
     this.headers = opts?.headers || {
       "Content-Type": "application/json"
     };
@@ -179,6 +185,13 @@ class Query {
       timeout: _timeout,
       ...rest
     };
+    const isStartsWithHttp = req.url.startsWith("http");
+    if (!isStartsWithHttp) {
+      if (this.baseURL) {
+        const baseURL = new URL(this.baseURL || globalThis?.location?.origin).origin;
+        req.url = baseURL + req.url;
+      }
+    }
     try {
       if (_beforeRequest) {
         const res = await _beforeRequest(req);
@@ -275,7 +288,7 @@ class Query {
   }
 }
 
-// node_modules/@kevisual/router/dist/router-browser.js
+// node_modules/.pnpm/@kevisual+router@0.0.84/node_modules/@kevisual/router/dist/router-browser.js
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
@@ -14026,8 +14039,14 @@ var toJSONSchema3 = toJSONSchema2;
 var fromJSONSchema3 = fromJSONSchema2;
 
 // src/create-query/index.ts
-var removeViewItemFromRoutes = (list) => {
+var removeViewItemCotnextFromRoutes = (list, options) => {
   for (const route of list) {
+    if (options?.removeViewItem) {
+      if (route.metadata?.viewItem) {
+        delete route.metadata.viewItem;
+      }
+      continue;
+    }
     if (route.metadata?.viewItem) {
       if (route.metadata.viewItem?.api?.query) {
         delete route.metadata.viewItem.api.query;
@@ -14042,9 +14061,9 @@ var removeViewItemFromRoutes = (list) => {
   }
   return list;
 };
-var createQueryByRoutes = (list) => {
+var createQueryByRoutes = (list, options) => {
   const obj = {};
-  list = removeViewItemFromRoutes(list);
+  list = removeViewItemCotnextFromRoutes(list, options);
   for (const route of list) {
     if (!obj[route.path]) {
       obj[route.path] = {};
@@ -14058,11 +14077,12 @@ var createQueryByRoutes = (list) => {
     }
     obj[route.path][route.key] = route;
   }
-  const code = `
-import { createQueryApi } from '@kevisual/query/api';
+  const before = options?.before || `import { createQueryApi } from '@kevisual/query/api';`;
+  const after = options?.after || `export { queryApi };`;
+  const code = `${before}
 const api = ${generateApiCode(obj)} as const;
 const queryApi = createQueryApi({ api });
-export { queryApi };
+${after}
 `;
   return code;
 };

package/dist/query-browser.d.ts

@@ -106,13 +106,14 @@ type QueryOpts$1 = {
 } & AdapterOpts;
 type QueryOptions = {
     url?: string;
+    baseURL?: string;
+    beforeRequest?: Fn;
     adapter?: typeof adapter;
     headers?: Record<string, string>;
     timeout?: number;
     isClient?: boolean;
     tokenName?: string;
     storage?: Storage;
-    beforeRequest?: Fn;
 };
 type Data = {
     path?: string;
@@ -155,6 +156,7 @@ declare const wrapperError: ({ code, message }: {
  */
 declare class Query {
     adapter: typeof adapter;
+    baseURL: string;
     url: string;
     /**
      * 请求前处理函数

package/dist/query-browser.js

@@ -317,6 +317,7 @@ var wrapperError = ({ code, message }) => {
 
 class Query {
   adapter;
+  baseURL;
   url;
   beforeRequest;
   afterResponse;
@@ -333,6 +334,11 @@ class Query {
     this.storage = opts?.storage || globalThis?.localStorage;
     const defaultURL = opts?.isClient ? "/client/router" : "/api/router";
     this.url = opts?.url || defaultURL;
+    if (this.url.startsWith("http")) {
+      const urlObj = new URL(this.url);
+      this.baseURL = urlObj.origin;
+    }
+    this.baseURL = opts?.baseURL || this.baseURL;
     this.headers = opts?.headers || {
       "Content-Type": "application/json"
     };
@@ -376,6 +382,13 @@ class Query {
       timeout: _timeout,
       ...rest
     };
+    const isStartsWithHttp = req.url.startsWith("http");
+    if (!isStartsWithHttp) {
+      if (this.baseURL) {
+        const baseURL = new URL(this.baseURL || globalThis?.location?.origin).origin;
+        req.url = baseURL + req.url;
+      }
+    }
     try {
       if (_beforeRequest) {
         const res = await _beforeRequest(req);

package/dist/query.d.ts

@@ -106,13 +106,14 @@ type QueryOpts = {
 } & AdapterOpts;
 type QueryOptions = {
     url?: string;
+    baseURL?: string;
+    beforeRequest?: Fn;
     adapter?: typeof adapter;
     headers?: Record<string, string>;
     timeout?: number;
     isClient?: boolean;
     tokenName?: string;
     storage?: Storage;
-    beforeRequest?: Fn;
 };
 type Data = {
     path?: string;
@@ -155,6 +156,7 @@ declare const wrapperError: ({ code, message }: {
  */
 declare class Query {
     adapter: typeof adapter;
+    baseURL: string;
     url: string;
     /**
      * 请求前处理函数

package/dist/query.js

@@ -120,6 +120,7 @@ var wrapperError = ({ code, message }) => {
 
 class Query {
   adapter;
+  baseURL;
   url;
   beforeRequest;
   afterResponse;
@@ -136,6 +137,11 @@ class Query {
     this.storage = opts?.storage || globalThis?.localStorage;
     const defaultURL = opts?.isClient ? "/client/router" : "/api/router";
     this.url = opts?.url || defaultURL;
+    if (this.url.startsWith("http")) {
+      const urlObj = new URL(this.url);
+      this.baseURL = urlObj.origin;
+    }
+    this.baseURL = opts?.baseURL || this.baseURL;
     this.headers = opts?.headers || {
       "Content-Type": "application/json"
     };
@@ -179,6 +185,13 @@ class Query {
       timeout: _timeout,
       ...rest
     };
+    const isStartsWithHttp = req.url.startsWith("http");
+    if (!isStartsWithHttp) {
+      if (this.baseURL) {
+        const baseURL = new URL(this.baseURL || globalThis?.location?.origin).origin;
+        req.url = baseURL + req.url;
+      }
+    }
     try {
       if (_beforeRequest) {
         const res = await _beforeRequest(req);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/query",
-  "version": "0.0.48",
+  "version": "0.0.50",
   "type": "module",
   "scripts": {
     "build": "npm run clean && bun run bun.config.ts",
@@ -19,8 +19,8 @@
   "description": "",
   "devDependencies": {
     "@kevisual/code-builder": "^0.0.6",
-    "@kevisual/router": "^0.0.80",
-    "@types/node": "^25.2.3",
+    "@kevisual/router": "^0.0.84",
+    "@types/node": "^25.3.0",
     "typescript": "^5.9.3",
     "es-toolkit": "^1.44.0",
     "zod": "^4.3.6",

package/src/create-query/index.ts

@@ -22,8 +22,14 @@ type RouteInfo = {
     }
   };
 }
-const removeViewItemFromRoutes = (list: RouteInfo[]) => {
+const removeViewItemCotnextFromRoutes = (list: RouteInfo[], options?: CreateQueryOptions) => {
   for (const route of list) {
+    if (options?.removeViewItem) {
+      if (route.metadata?.viewItem) {
+        delete route.metadata.viewItem;
+      }
+      continue;
+    }
     if (route.metadata?.viewItem) {
       if (route.metadata.viewItem?.api?.query) {
         delete route.metadata.viewItem.api.query;
@@ -38,9 +44,14 @@ const removeViewItemFromRoutes = (list: RouteInfo[]) => {
   }
   return list;
 }
-export const createQueryByRoutes = (list: RouteInfo[]) => {
+type CreateQueryOptions = {
+  removeViewItem?: boolean,
+  before?: string,
+  after?: string,
+}
+export const createQueryByRoutes = (list: RouteInfo[], options?: CreateQueryOptions) => {
   const obj: any = {};
-  list = removeViewItemFromRoutes(list);
+  list = removeViewItemCotnextFromRoutes(list, options);
   for (const route of list) {
     if (!obj[route.path]) {
       obj[route.path] = {};
@@ -55,11 +66,12 @@ export const createQueryByRoutes = (list: RouteInfo[]) => {
     }
     obj[route.path][route.key] = route;
   }
-  const code = `
-import { createQueryApi } from '@kevisual/query/api';
+  const before = options?.before || `import { createQueryApi } from '@kevisual/query/api';`;
+  const after = options?.after || `export { queryApi };`;
+  const code = `${before}
 const api = ${generateApiCode(obj)} as const;
 const queryApi = createQueryApi({ api });
-export { queryApi };
+${after}
 `
   return code;
 }

package/src/query-api.ts

@@ -1,4 +1,4 @@
-import { DataOpts, Query } from "./query.ts";
+import { DataOpts, Query, Result } from "./query.ts";
 import { z } from "zod";
 import { createQueryByRoutes } from "./create-query/index.ts";
 import { pick } from 'es-toolkit'
@@ -71,22 +71,23 @@ type IsOptional<T> = T extends { optional: true } ? true : false;
 // 根据 optional 字段分离必需字段和可选字段
 type ExtractArgsFromMetadata<T> = T extends { metadata?: { args?: infer A } }
   ? A extends Record<string, any>
-    ? (
-        // 必需字段（没有 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
+  ? (
+    // 必需字段（没有 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]]: (
+    [Key in keyof P[Path]]: <T = any>(
       data?: ExtractArgsFromMetadata<P[Path][Key]>,
       opts?: DataOpts
-    ) => ReturnType<Query['post']>
+    ) => Promise<Result<T>>
   }
 }
 type QueryApiOpts<P extends { [path: string]: { [key: string]: Pos } } = {}> = {

package/src/query.ts

@@ -20,13 +20,14 @@ export type QueryOpts = {
 
 export type QueryOptions = {
   url?: string;
+  baseURL?: string;
+  beforeRequest?: Fn;
   adapter?: typeof adapter;
   headers?: Record<string, string>;
   timeout?: number;
   isClient?: boolean;
   tokenName?: string;
   storage?: Storage;
-  beforeRequest?: Fn;
 }
 export type Data = {
   path?: string;
@@ -67,6 +68,7 @@ export const wrapperError = ({ code, message }: { code?: number; message?: strin
  */
 export class Query {
   adapter: typeof adapter;
+  baseURL: string;
   url: string;
   /**
    * 请求前处理函数
@@ -93,6 +95,11 @@ export class Query {
     this.storage = opts?.storage || globalThis?.localStorage;
     const defaultURL = opts?.isClient ? '/client/router' : '/api/router';
     this.url = opts?.url || defaultURL;
+    if (this.url.startsWith('http')) {
+      const urlObj = new URL(this.url);
+      this.baseURL = urlObj.origin;
+    }
+    this.baseURL = opts?.baseURL || this.baseURL; // 如果opts中有baseURL优先
     this.headers = opts?.headers || {
       'Content-Type': 'application/json',
     };
@@ -155,6 +162,14 @@ export class Query {
       timeout: _timeout,
       ...rest,
     };
+    const isStartsWithHttp = req.url.startsWith('http');
+    // 如果是完整的url，直接使用, 如果不是完整的url，且baseURL存在，则拼接baseURL
+    if (!isStartsWithHttp) {
+      if (this.baseURL) {
+        const baseURL = new URL(this.baseURL || globalThis?.location?.origin).origin;
+        req.url = baseURL + req.url;
+      }
+    }
     try {
       if (_beforeRequest) {
         const res = await _beforeRequest(req);