Skip to content

Commit b4e1253

Browse files
committed
refactor(request)!: remove cancelRequest method and related logic from request instances
1 parent 50a5cba commit b4e1253

File tree

3 files changed

+2
-28
lines changed

3 files changed

+2
-28
lines changed

packages/axios/src/index.ts

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,6 @@ function createCommonRequest<
8181
}
8282
);
8383

84-
function cancelRequest(requestId: string) {
85-
const abortController = abortControllerMap.get(requestId);
86-
if (abortController) {
87-
abortController.abort();
88-
abortControllerMap.delete(requestId);
89-
}
90-
}
91-
9284
function cancelAllRequest() {
9385
abortControllerMap.forEach(abortController => {
9486
abortController.abort();
@@ -99,7 +91,6 @@ function createCommonRequest<
9991
return {
10092
instance,
10193
opts,
102-
cancelRequest,
10394
cancelAllRequest
10495
};
10596
}
@@ -114,10 +105,7 @@ export function createRequest<ResponseData, ApiData, State extends Record<string
114105
axiosConfig?: CreateAxiosDefaults,
115106
options?: Partial<RequestOption<ResponseData, ApiData, State>>
116107
) {
117-
const { instance, opts, cancelRequest, cancelAllRequest } = createCommonRequest<ResponseData, ApiData, State>(
118-
axiosConfig,
119-
options
120-
);
108+
const { instance, opts, cancelAllRequest } = createCommonRequest<ResponseData, ApiData, State>(axiosConfig, options);
121109

122110
const request: RequestInstance<ApiData, State> = async function request<
123111
T extends ApiData = ApiData,
@@ -134,7 +122,6 @@ export function createRequest<ResponseData, ApiData, State extends Record<string
134122
return response.data as MappedType<R, T>;
135123
} as RequestInstance<ApiData, State>;
136124

137-
request.cancelRequest = cancelRequest;
138125
request.cancelAllRequest = cancelAllRequest;
139126
request.state = {} as State;
140127

@@ -153,10 +140,7 @@ export function createFlatRequest<ResponseData, ApiData, State extends Record<st
153140
axiosConfig?: CreateAxiosDefaults,
154141
options?: Partial<RequestOption<ResponseData, ApiData, State>>
155142
) {
156-
const { instance, opts, cancelRequest, cancelAllRequest } = createCommonRequest<ResponseData, ApiData, State>(
157-
axiosConfig,
158-
options
159-
);
143+
const { instance, opts, cancelAllRequest } = createCommonRequest<ResponseData, ApiData, State>(axiosConfig, options);
160144

161145
const flatRequest: FlatRequestInstance<ResponseData, ApiData, State> = async function flatRequest<
162146
T extends ApiData = ApiData,
@@ -179,7 +163,6 @@ export function createFlatRequest<ResponseData, ApiData, State extends Record<st
179163
}
180164
} as FlatRequestInstance<ResponseData, ApiData, State>;
181165

182-
flatRequest.cancelRequest = cancelRequest;
183166
flatRequest.cancelAllRequest = cancelAllRequest;
184167
flatRequest.state = {
185168
...opts.defaultState

packages/axios/src/type.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,6 @@ export type CustomAxiosRequestConfig<R extends ResponseType = 'json'> = Omit<Axi
7979
};
8080

8181
export interface RequestInstanceCommon<State extends Record<string, unknown>> {
82-
/**
83-
* cancel the request by request id
84-
*
85-
* if the request provide abort controller sign from config, it will not collect in the abort controller map
86-
*
87-
* @param requestId
88-
*/
89-
cancelRequest: (requestId: string) => void;
9082
/**
9183
* cancel all request
9284
*

packages/hooks/src/use-request.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ export default function createHookRequest<ResponseData, ApiData, State extends R
7373
};
7474
} as HookRequestInstance<ResponseData, ApiData, State>;
7575

76-
hookRequest.cancelRequest = request.cancelRequest;
7776
hookRequest.cancelAllRequest = request.cancelAllRequest;
7877

7978
return hookRequest;

0 commit comments

Comments
 (0)