@kevisual/query 0.0.46 → 0.0.48

package/dist/query-adapter.d.ts

@@ -11,14 +11,6 @@ type AdapterOpts = {
     body?: Record<string, any> | FormData;
     timeout?: number;
     method?: Method;
-    /**
-     * @deprecated use responseType
-     */
-    isBlob?: boolean;
-    /**
-     * @deprecated use responseType
-     */
-    isText?: boolean;
     /**
      * 响应类型,
      * */
@@ -33,10 +25,6 @@ declare const isTextForContentType: (contentType: string | null) => boolean;
  * @returns
  */
 declare const adapter: (opts?: AdapterOpts, overloadOpts?: RequestInit) => Promise<any>;
-/**
- * adapter
- */
-declare const queryFetch: (opts?: AdapterOpts, overloadOpts?: RequestInit) => Promise<any>;
 
-export { adapter, isTextForContentType, methods, queryFetch };
+export { adapter, isTextForContentType, methods };
 export type { AdapterOpts, Method };

package/dist/query-adapter.js

@@ -3,19 +3,13 @@ var methods = ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS", "HEAD"];
 var isTextForContentType = (contentType) => {
   if (!contentType)
     return false;
-  const textTypes = ["text/", "xml", "html", "javascript", "css", "csv", "plain", "x-www-form-urlencoded", "md"];
+  const textTypes = ["text/", "xml", "html", "javascript", "css", "csv", "plain", "x-www-form-urlencoded", "md", "json"];
   return textTypes.some((type) => contentType.includes(type));
 };
 var adapter = async (opts = {}, overloadOpts) => {
   const controller = new AbortController;
   const signal = controller.signal;
   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;
   const timer = setTimeout(() => {
     controller.abort();
@@ -74,21 +68,31 @@ var adapter = async (opts = {}, overloadOpts) => {
     headers
   }).then(async (response) => {
     const contentType = response.headers.get("Content-Type");
-    if (responseType === "blob") {
-      return await response.blob();
-    }
-    const isText = responseType === "text";
     const isJson = contentType && contentType.includes("application/json");
-    if (isJson && !isText) {
-      return await response.json();
+    const isSuccess = response.ok;
+    if (isJson) {
+      const json = await response.json();
+      if (json?.code) {
+        return json;
+      }
+      return {
+        code: isSuccess ? 200 : response.status,
+        status: response.status,
+        data: json
+      };
     } else if (isTextForContentType(contentType)) {
       return {
-        code: response.status,
+        code: isSuccess ? 200 : response.status,
         status: response.status,
         data: await response.text()
       };
     } else {
-      return response;
+      return {
+        code: isSuccess ? 200 : response.status,
+        status: response.status,
+        data: "非文本非JSON响应, 请手动处理response。",
+        response
+      };
     }
   }).catch((err) => {
     if (err.name === "AbortError") {
@@ -105,9 +109,7 @@ var adapter = async (opts = {}, overloadOpts) => {
     clearTimeout(timer);
   });
 };
-var queryFetch = adapter;
 export {
-  queryFetch,
   methods,
   isTextForContentType,
   adapter

package/dist/query-api.d.ts

@@ -14,14 +14,6 @@ type AdapterOpts = {
     body?: Record<string, any> | FormData;
     timeout?: number;
     method?: Method;
-    /**
-     * @deprecated use responseType
-     */
-    isBlob?: boolean;
-    /**
-     * @deprecated use responseType
-     */
-    isText?: boolean;
     /**
      * 响应类型,
      * */
@@ -119,6 +111,8 @@ type QueryOptions = {
     headers?: Record<string, string>;
     timeout?: number;
     isClient?: boolean;
+    tokenName?: string;
+    storage?: Storage;
     beforeRequest?: Fn;
 };
 type Data = {
@@ -171,10 +165,9 @@ declare class Query {
      */
     stop?: boolean;
     qws: QueryWs;
-    /**
-     * 默认是 /client/router或者 默认是 /api/router
-     */
-    isClient: boolean;
+    tokenName: string;
+    storage: Storage;
+    token: string;
     constructor(opts?: QueryOptions);
     setQueryWs(qws: QueryWs): void;
     /**
@@ -298,20 +291,25 @@ type InferType<T> = T extends z.ZodType<infer U> ? U : T extends {
 } ? InferFromJSONSchema<T> : T extends {
     properties: infer P;
 } ? InferFromJSONSchema<T> : T;
+type IsOptional<T> = T extends {
+    optional: true;
+} ? true : false;
 type ExtractArgsFromMetadata<T> = T extends {
     metadata?: {
         args?: infer A;
     };
-} ? A extends Record<string, any> ? {
-    [K in keyof A]: InferType<A[K]>;
-} : never : never;
+} ? A extends Record<string, any> ? ({
+    [K in keyof A as IsOptional<A[K]> extends true ? never : K]: InferType<A[K]>;
+} & {
+    [K in keyof A as IsOptional<A[K]> extends true ? K : never]?: InferType<A[K]>;
+}) : never : never;
 type ApiMethods<P extends {
     [path: string]: {
         [key: string]: Pos;
     };
 }> = {
     [Path in keyof P]: {
-        [Key in keyof P[Path]]: (data?: Partial<ExtractArgsFromMetadata<P[Path][Key]>>, opts?: DataOpts) => ReturnType<Query['post']>;
+        [Key in keyof P[Path]]: (data?: ExtractArgsFromMetadata<P[Path][Key]>, opts?: DataOpts) => ReturnType<Query['post']>;
     };
 };
 type QueryApiOpts<P extends {
@@ -329,7 +327,7 @@ declare class QueryApi<P extends {
 } = {}> {
     query: Query;
     constructor(opts?: QueryApiOpts<P>);
-    post<T extends Pos>(pos: T, data?: Partial<ExtractArgsFromMetadata<T>>, opts?: DataOpts): Promise<{
+    post<T extends Pos>(pos: T, data?: ExtractArgsFromMetadata<T>, opts?: DataOpts): Promise<{
         code: number;
         data?: any;
         message?: string;