@anjianshi/utils 3.8.5 → 3.8.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anjianshi/utils",
-  "version": "3.8.5",
+  "version": "3.8.6",
   "description": "Common JavaScript Utils",
   "homepage": "https://github.com/anjianshi/js-packages/utils",
   "bugs": {
@@ -38,11 +38,11 @@
     "redis": "^5.5.6",
     "typescript": "^5.8.3",
     "vconsole": "^3.15.1",
-    "@anjianshi/presets-eslint-typescript": "6.1.2",
-    "@anjianshi/presets-eslint-node": "6.1.2",
     "@anjianshi/presets-eslint-base": "6.1.2",
+    "@anjianshi/presets-eslint-node": "6.1.2",
     "@anjianshi/presets-eslint-react": "6.1.3",
     "@anjianshi/presets-prettier": "3.2.0",
+    "@anjianshi/presets-eslint-typescript": "6.1.2",
     "@anjianshi/presets-typescript": "3.2.5"
   },
   "prettier": "@anjianshi/presets-prettier/prettierrc"

package/request/client.js

@@ -2,6 +2,7 @@
  * 实现一个功能完善、异常处理逻辑全面的请求发起器。
  * 可通过继承子类来扩展其功能。
  */
+import isPlainObject from 'lodash/isPlainObject.js';
 import pick from 'lodash/pick.js';
 import { success, failed, formatFailed, exceptionToFailed, } from '../lang/result.js';
 import { getLogger } from '../logging/index.js';
@@ -115,7 +116,8 @@ export class BaseRequestClient {
     // -------------------------------
     async formatOptions(input) {
         const predefined = this.prefefinedOptions;
-        const { urlPrefix = predefined.urlPrefix ?? '', url: rawUrl, query = {}, method = predefined.method ?? 'GET', headers: rawHeaders = {}, body: rawBody = null, data, binary = false, timeout = predefined.timeout ?? 0, signal, retry = predefined.retry ?? 0, format, } = input;
+        const { urlPrefix = predefined.urlPrefix ?? '', url: rawUrl, query = {}, method = predefined.method ?? 'GET', headers: rawHeaders = {}, body: rawBody = null, data, // eslint-disable-line @typescript-eslint/no-unsafe-assignment
+        binary = false, timeout = predefined.timeout ?? 0, signal, retry = predefined.retry ?? 0, format, } = input;
         const headers = {
             ...(predefined.headers ?? {}),
             ...rawHeaders,
@@ -123,7 +125,9 @@ export class BaseRequestClient {
         let body = rawBody;
         if (data !== undefined) {
             if (method === 'GET') {
-                Object.assign(query, data);
+                if (isPlainObject(data)) {
+                    Object.assign(query, data);
+                }
             }
             else {
                 body = data instanceof FormData ? data : JSON.stringify(data);

package/request/options.d.ts

@@ -9,10 +9,13 @@ export interface Options<T = unknown> {
     headers?: Record<string, string>;
     body?: string | FormData | null;
     /**
-     * 向后端传递的数据。对于 GET 请求，会合并到 query 中；对于 POST 请求，会作为 POST body，代替 body 参数
-     * 注意：为了支持传入 interface 类型的值，Record 只能定义成 Record<string, any>
+     * 向后端传递的数据。
+     * 1. 对于 GET 请求：若 data 为 plain object 会合并到 query 中，否则会被忽略。
+     * 2. 对于 POST 请求：会作为 POST body，代替 body 参数。
+     *    其中若为 FormData，会原样交给 fetch()；否则进行 JSON 化。
+     * 3. 为了支持传入 interface 类型的值，Record 只能定义成 Record<string, any>
      */
-    data?: FormData | Record<string, any>;
+    data?: any;
     /** 是否把响应内容作为二进制处理（结果是 blob） */
     binary?: boolean;
     /** 超时时间，不指定或设为 0 代表不限 */