@kevisual/query 0.0.22 → 0.0.24

package/dist/query-adapter.d.ts

@@ -8,6 +8,7 @@ type AdapterOpts = {
     method?: Method;
     isBlob?: boolean;
 };
+declare const isTextForContentType: (contentType: string | null) => boolean;
 /**
  *
  * @param opts
@@ -20,5 +21,5 @@ declare const adapter: (opts: AdapterOpts, overloadOpts?: RequestInit) => Promis
  */
 declare const queryFetch: (opts: AdapterOpts, overloadOpts?: RequestInit) => Promise<any>;
 
-export { adapter, methods, queryFetch };
+export { adapter, isTextForContentType, methods, queryFetch };
 export type { AdapterOpts, Method };

package/dist/query-adapter.js

@@ -1,4 +1,10 @@
 const methods = ['GET', 'POST'];
+const isTextForContentType = (contentType) => {
+    if (!contentType)
+        return false;
+    const textTypes = ['text/', 'xml', 'html', 'javascript', 'css', 'csv', 'plain', 'x-www-form-urlencoded'];
+    return textTypes.some((type) => contentType.includes(type));
+};
 /**
  *
  * @param opts
@@ -48,8 +54,15 @@ const adapter = async (opts, overloadOpts) => {
         if (isJson) {
             return response.json(); // 解析为 JSON
         }
+        else if (isTextForContentType(contentType)) {
+            return {
+                code: 200,
+                status: response.status,
+                data: response.text(), // 直接返回文本内容
+            };
+        }
         else {
-            return response.text(); // 解析为文本
+            return response;
         }
     })
         .catch((err) => {
@@ -70,4 +83,4 @@ const adapter = async (opts, overloadOpts) => {
  */
 const queryFetch = adapter;
 
-export { adapter, methods, queryFetch };
+export { adapter, isTextForContentType, methods, queryFetch };

package/dist/query-browser.js

@@ -1,3 +1,9 @@
+const isTextForContentType = (contentType) => {
+    if (!contentType)
+        return false;
+    const textTypes = ['text/', 'xml', 'html', 'javascript', 'css', 'csv', 'plain', 'x-www-form-urlencoded'];
+    return textTypes.some((type) => contentType.includes(type));
+};
 /**
  *
  * @param opts
@@ -47,8 +53,15 @@ const adapter = async (opts, overloadOpts) => {
         if (isJson) {
             return response.json(); // 解析为 JSON
         }
+        else if (isTextForContentType(contentType)) {
+            return {
+                code: 200,
+                status: response.status,
+                data: response.text(), // 直接返回文本内容
+            };
+        }
         else {
-            return response.text(); // 解析为文本
+            return response;
         }
     })
         .catch((err) => {
@@ -470,52 +483,7 @@ class Query {
                 ...(_options?.headers || {}),
             },
         });
-        if (!res.ok) {
-            return wrapperError({
-                code: res.status,
-                message: `fetch error: ${res.statusText}`,
-            });
-        }
-        const contentType = res.headers.get('Content-Type');
-        if (contentType && contentType.includes('application/json')) {
-            const data = await res.json();
-            const result = { code: res.status, data, success: res.ok };
-            return setBaseResponse(result);
-        }
-        if (contentType && contentType.includes('text/html')) {
-            const text = await res.text();
-            const result = {
-                code: res.status,
-                data: text,
-                success: res.ok,
-            };
-            return setBaseResponse(result);
-        }
-        if (contentType && contentType.includes('text/plain')) {
-            let text = await res.text();
-            // 处理特殊情况，比如返回的是纯文本
-            if (text.startsWith('{')) {
-                try {
-                    text = JSON.parse(text);
-                }
-                catch (e) {
-                    // 如果解析失败，保持原样
-                }
-            }
-            const result = {
-                code: res.status,
-                data: text,
-                success: res.ok,
-            };
-            return setBaseResponse(result);
-        }
-        const blob = await res.blob();
-        const result = {
-            code: res.status,
-            data: blob,
-            success: res.ok,
-        };
-        return setBaseResponse(result);
+        return setBaseResponse(res);
     }
 }
 class BaseQuery {

package/dist/query.js

@@ -1,3 +1,9 @@
+const isTextForContentType = (contentType) => {
+    if (!contentType)
+        return false;
+    const textTypes = ['text/', 'xml', 'html', 'javascript', 'css', 'csv', 'plain', 'x-www-form-urlencoded'];
+    return textTypes.some((type) => contentType.includes(type));
+};
 /**
  *
  * @param opts
@@ -47,8 +53,15 @@ const adapter = async (opts, overloadOpts) => {
         if (isJson) {
             return response.json(); // 解析为 JSON
         }
+        else if (isTextForContentType(contentType)) {
+            return {
+                code: 200,
+                status: response.status,
+                data: response.text(), // 直接返回文本内容
+            };
+        }
         else {
-            return response.text(); // 解析为文本
+            return response;
         }
     })
         .catch((err) => {
@@ -254,52 +267,7 @@ class Query {
                 ...(_options?.headers || {}),
             },
         });
-        if (!res.ok) {
-            return wrapperError({
-                code: res.status,
-                message: `fetch error: ${res.statusText}`,
-            });
-        }
-        const contentType = res.headers.get('Content-Type');
-        if (contentType && contentType.includes('application/json')) {
-            const data = await res.json();
-            const result = { code: res.status, data, success: res.ok };
-            return setBaseResponse(result);
-        }
-        if (contentType && contentType.includes('text/html')) {
-            const text = await res.text();
-            const result = {
-                code: res.status,
-                data: text,
-                success: res.ok,
-            };
-            return setBaseResponse(result);
-        }
-        if (contentType && contentType.includes('text/plain')) {
-            let text = await res.text();
-            // 处理特殊情况，比如返回的是纯文本
-            if (text.startsWith('{')) {
-                try {
-                    text = JSON.parse(text);
-                }
-                catch (e) {
-                    // 如果解析失败，保持原样
-                }
-            }
-            const result = {
-                code: res.status,
-                data: text,
-                success: res.ok,
-            };
-            return setBaseResponse(result);
-        }
-        const blob = await res.blob();
-        const result = {
-            code: res.status,
-            data: blob,
-            success: res.ok,
-        };
-        return setBaseResponse(result);
+        return setBaseResponse(res);
     }
 }
 class BaseQuery {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/query",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",