@kevisual/query 0.0.21 → 0.0.23

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.d.ts

@@ -197,7 +197,7 @@ declare class Query {
      * @param fn 处理函数
      */
     after(fn: DataOpts['afterResponse']): void;
-    fetchText(url: string, options?: RequestInit): Promise<Result<any>>;
+    fetchText(urlOrOptions?: string | QueryOpts$1, options?: QueryOpts$1): Promise<Result<any>>;
 }
 
 declare class BaseQuery<T extends Query = Query, R extends {

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) => {
@@ -454,16 +467,23 @@ class Query {
     after(fn) {
         this.afterResponse = fn;
     }
-    async fetchText(url, options) {
-        const res = await fetch(url, {
+    async fetchText(urlOrOptions, options) {
+        let _options = { ...options };
+        if (typeof urlOrOptions === 'string' && !_options.url) {
+            _options.url = urlOrOptions;
+        }
+        if (typeof urlOrOptions === 'object') {
+            _options = { ...urlOrOptions, ..._options };
+        }
+        const res = await adapter({
             method: 'GET',
-            ...options,
+            ..._options,
             headers: {
                 ...this.headers,
-                ...(options?.headers || {}),
+                ...(_options?.headers || {}),
             },
         });
-        if (!res.ok) {
+        if (res.status !== 200) {
             return wrapperError({
                 code: res.status,
                 message: `fetch error: ${res.statusText}`,
@@ -475,28 +495,10 @@ class Query {
             const result = { code: res.status, data, success: res.ok };
             return setBaseResponse(result);
         }
-        if (contentType && contentType.includes('text/html')) {
+        if (isTextForContentType(contentType)) {
             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,
+                code: res.status || 200,
                 data: text,
                 success: res.ok,
             };

package/dist/query.d.ts

@@ -204,7 +204,7 @@ declare class Query {
      * @param fn 处理函数
      */
     after(fn: DataOpts['afterResponse']): void;
-    fetchText(url: string, options?: RequestInit): Promise<Result<any>>;
+    fetchText(urlOrOptions?: string | QueryOpts, options?: QueryOpts): Promise<Result<any>>;
 }
 
 declare class BaseQuery<T extends Query = Query, R extends {

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) => {
@@ -238,16 +251,23 @@ class Query {
     after(fn) {
         this.afterResponse = fn;
     }
-    async fetchText(url, options) {
-        const res = await fetch(url, {
+    async fetchText(urlOrOptions, options) {
+        let _options = { ...options };
+        if (typeof urlOrOptions === 'string' && !_options.url) {
+            _options.url = urlOrOptions;
+        }
+        if (typeof urlOrOptions === 'object') {
+            _options = { ...urlOrOptions, ..._options };
+        }
+        const res = await adapter({
             method: 'GET',
-            ...options,
+            ..._options,
             headers: {
                 ...this.headers,
-                ...(options?.headers || {}),
+                ...(_options?.headers || {}),
             },
         });
-        if (!res.ok) {
+        if (res.status !== 200) {
             return wrapperError({
                 code: res.status,
                 message: `fetch error: ${res.statusText}`,
@@ -259,28 +279,10 @@ class Query {
             const result = { code: res.status, data, success: res.ok };
             return setBaseResponse(result);
         }
-        if (contentType && contentType.includes('text/html')) {
+        if (isTextForContentType(contentType)) {
             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,
+                code: res.status || 200,
                 data: text,
                 success: res.ok,
             };

package/package.json

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