@anjianshi/utils 3.3.0 → 3.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anjianshi/utils",
-  "version": "3.3.0",
+  "version": "3.5.0",
   "description": "Common JavaScript Utils",
   "homepage": "https://github.com/anjianshi/js-packages/utils",
   "bugs": {
@@ -32,11 +32,11 @@
     "typescript": "^5.8.3",
     "vconsole": "^3.15.1",
     "@anjianshi/presets-eslint-node": "6.0.0",
-    "@anjianshi/presets-prettier": "3.0.5",
+    "@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-eslint-react": "6.0.0",
-    "@anjianshi/presets-eslint-base": "6.0.0"
+    "@anjianshi/presets-typescript": "3.2.5"
   },
   "peerDependencies": {
     "@emotion/react": "^11.14.0",

package/request/client.d.ts

@@ -10,9 +10,9 @@ 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>>;
-    formatOptions(input: Options): Promise<FormattedOptions>;
+    asFunction(): <T>(inputUrl: string, inputOptions?: Options<T>) => Promise<Result<T, FailedT>>;
+    request<T>(inputUrl: string, inputOptions?: Options<T>): Promise<Result<T, FailedT>>;
+    formatOptions<T>(input: Options<T>): Promise<FormattedOptions<T>>;
     /** 请求发起前调用此方法补充 Headers 内容 */
     protected getHeaders(options: FormattedOptions, inputOptions: Options): Record<string, string> | undefined | Promise<Record<string, string> | undefined>;
     /**

package/request/client.js

@@ -38,7 +38,7 @@ export class BaseRequestClient {
         }
         catch (error) {
             // 失败情形“手动取消”
-            if (manualSignal && manualSignal.aborted && manualSignal.reason === error) {
+            if (manualSignal?.aborted && manualSignal.reason === error) {
                 const reason = error instanceof DOMException && error.name === 'AbortError' ? null : error;
                 return this.handleError(failed('Request Aborted', 'RequestAborted', { options, reason }));
             }
@@ -99,7 +99,7 @@ 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, timeout = predefined.timeout ?? 0, binary = false, signal, } = input;
+        const { urlPrefix = predefined.urlPrefix ?? '', url: rawUrl, query = {}, method = predefined.method ?? 'GET', headers: rawHeaders = {}, body: rawBody = null, data, timeout = predefined.timeout ?? 0, binary = false, signal, format, } = input;
         const headers = {
             ...(predefined.headers ?? {}),
             ...rawHeaders,
@@ -123,6 +123,7 @@ export class BaseRequestClient {
             timeout,
             binary,
             signal,
+            format,
         };
         Object.assign(options.headers, await this.getHeaders(options, input));
         return options;

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>;
@@ -20,9 +20,9 @@ export interface Options {
     /** 可通过此信号手动终止请求 */
     signal?: AbortSignal;
     /** 对请求成功时得到的数据进行最终格式化 */
-    format?: <RawT, FormattedT>(responseData: RawT) => FormattedT;
+    format?: (responseData: any) => 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' | 'format'>;
+export type FormattedOptions<T = unknown> = Required<Pick<Options, 'url' | 'method' | 'headers' | 'body' | 'timeout' | 'binary'>> & Pick<Options<T>, 'signal' | 'format'>;