@anjianshi/utils 3.2.0 → 3.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anjianshi/utils",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Common JavaScript Utils",
   "homepage": "https://github.com/anjianshi/js-packages/utils",
   "bugs": {
@@ -31,12 +31,12 @@
     "redis": "^5.5.6",
     "typescript": "^5.8.3",
     "vconsole": "^3.15.1",
-    "@anjianshi/presets-eslint-base": "6.0.0",
-    "@anjianshi/presets-eslint-node": "6.0.0",
+    "@anjianshi/presets-prettier": "3.0.5",
     "@anjianshi/presets-eslint-react": "6.0.0",
+    "@anjianshi/presets-eslint-node": "6.0.0",
+    "@anjianshi/presets-eslint-base": "6.0.0",
     "@anjianshi/presets-eslint-typescript": "6.0.0",
-    "@anjianshi/presets-typescript": "3.2.5",
-    "@anjianshi/presets-prettier": "3.0.5"
+    "@anjianshi/presets-typescript": "3.2.5"
   },
   "peerDependencies": {
     "@emotion/react": "^11.14.0",

package/request/client.d.ts

@@ -10,8 +10,8 @@ export declare abstract class BaseRequestClient<FailedT extends Failed> {
         loggerName?: string;
     });
     /** 生成一个快捷方式函数，调用它相当于调用 client.request() */
-    asFunction(): <T>(inputUrl: string, inputOptions?: Options) => Promise<Result<T, FailedT>>;
-    request<T>(inputUrl: string, inputOptions?: Options): Promise<Result<T, FailedT>>;
+    asFunction(): <T>(inputUrl: string, inputOptions?: Options<T>) => Promise<Result<T, FailedT>>;
+    request<T>(inputUrl: string, inputOptions?: Options<T>): Promise<Result<T, FailedT>>;
     formatOptions(input: Options): Promise<FormattedOptions>;
     /** 请求发起前调用此方法补充 Headers 内容 */
     protected getHeaders(options: FormattedOptions, inputOptions: Options): Record<string, string> | undefined | Promise<Record<string, string> | undefined>;

package/request/client.js

@@ -3,7 +3,7 @@
  * 可通过继承子类来扩展其功能。
  */
 import pick from 'lodash/pick.js';
-import { success, failed, formatFailed, exceptionToFailed, } from '../lang/result.js';
+import { success, failed, formatSuccess, formatFailed, exceptionToFailed, } from '../lang/result.js';
 import { getLogger } from '../logging/index.js';
 import { combineUrl } from '../url.js';
 /** 此基类不可直接使用，因其未对错误格式进行具体约定 */
@@ -26,7 +26,7 @@ export class BaseRequestClient {
             url: inputUrl,
             ...(inputOptions ?? {}),
         });
-        const { url, method, headers, body, timeout, signal: manualSignal } = options;
+        const { url, method, headers, body, timeout, signal: manualSignal, format } = options;
         const timeoutSignal = timeout ? AbortSignal.timeout(timeout) : undefined;
         const signal = manualSignal || timeoutSignal
             ? AbortSignal.any([manualSignal, timeoutSignal].filter(Boolean))
@@ -63,7 +63,7 @@ export class BaseRequestClient {
         }
         // 解析响应内容
         const result = await this.parseResponse(options, response);
-        return result;
+        return formatSuccess(result, data => (format ? format(data) : data));
     }
     // -------------------------------
     // 请求预处理

package/request/index.d.ts

@@ -1,5 +1,5 @@
 export type * from './options.js';
-export * from './error.js';
-export * as errors from './error.js';
+export type * from './error.js';
+export type * as errors from './error.js';
 export * from './client.js';
 export * from './instance.js';

package/request/index.js

@@ -1,4 +1,2 @@
-export * from './error.js';
-export * as errors from './error.js';
 export * from './client.js';
 export * from './instance.js';

package/request/instance.d.ts

@@ -1,4 +1,4 @@
 import { RequestClient } from './client.js';
 /** 提供一个即取即用的 RequestClient 实例及其函数版本 */
 export declare const client: RequestClient;
-export declare const request: <T>(inputUrl: string, inputOptions?: import("./options.js").Options) => Promise<import("../index.js").Result<T, import("./error.js").RequestFailed>>;
+export declare const request: <T>(inputUrl: string, inputOptions?: import("./options.js").Options<T> | undefined) => Promise<import("../index.js").Result<T, import("./error.js").RequestFailed>>;

package/request/options.d.ts

@@ -1,7 +1,7 @@
 /**
  * 请求参数
  */
-export interface Options {
+export interface Options<T = unknown> {
     urlPrefix?: string;
     url?: string;
     query?: Record<string, string | number | undefined>;
@@ -19,8 +19,9 @@ export interface Options {
     timeout?: number;
     /** 可通过此信号手动终止请求 */
     signal?: AbortSignal;
+    format?: (responseData: unknown) => T;
 }
 /** 可预指定的请求参数 */
 export type PredefinedOptions = Pick<Options, 'urlPrefix' | 'method' | 'headers' | 'timeout'>;
 /** 经过整理的请求参数（client 内部使用） */
-export type FormattedOptions = Required<Pick<Options, 'url' | 'method' | 'headers' | 'body' | 'timeout' | 'binary'>> & Pick<Options, 'signal'>;
+export type FormattedOptions = Required<Pick<Options, 'url' | 'method' | 'headers' | 'body' | 'timeout' | 'binary'>> & Pick<Options, 'signal' | 'format'>;