fix: 配置原始 URL 丢失

Author: zjxxxxxxxxx

src/request/dispatchRequest.ts

@@ -10,7 +10,6 @@ import { Cancel, isCancel, isCancelToken } from './cancel';
 import { flattenHeaders } from './flattenHeaders';
 import { AxiosTransformer, transformData } from './transformData';
 import { request } from './request';
-import { transformURL } from './transformURL';
 import { AxiosErrorResponse } from './createError';
 
 /**
@@ -38,8 +37,6 @@ export function dispatchRequest(config: AxiosRequestConfig) {
  delete config.data;
  }
 
- config.url = transformURL(config);
-
  function onSuccess(response: AxiosResponse) {
  throwIfCancellationRequested(config);
  dataTransformer(response, config.transformResponse);

src/request/request.ts

@@ -13,6 +13,7 @@ import {
 import { isCancelToken } from './cancel';
 import { AxiosErrorResponse, createError } from './createError';
 import { generateType } from './generateType';
+import { transformURL } from './transformURL';
 
 /**
  * 开始请求
@@ -25,6 +26,7 @@ export function request(config: AxiosRequestConfig) {
  return new Promise<AxiosResponse>((resolve, reject) => {
  const adapterConfig: AxiosAdapterRequestConfig = {
  ...(config as AxiosAdapterRequestConfig),
+ url: transformURL(config),
  type: generateType(config),
  success,
  fail,

test/request/dispatchRequest.test.ts

@@ -86,36 +86,6 @@ describe('src/request/dispatchRequest.ts', () => {
  `);
  });
 
- test('应该支持转换 URL', () => {
- const c1 = {
- ...defaults,
- url: 'test',
- };
- const c2 = {
- ...defaults,
- url: 'test/:id',
- params: {
- id: 1,
- },
- };
- const c3 = {
- ...defaults,
- method: 'post' as const,
- url: 'test/:id',
- data: {
- id: 1,
- },
- };
-
- dispatchRequest(c1);
- dispatchRequest(c2);
- dispatchRequest(c3);
-
- expect(c1.url).toBe('http://api.com/test');
- expect(c2.url).toBe('http://api.com/test/1');
- expect(c3.url).toBe('http://api.com/test/1');
- });
-
  test('应该支持拉平请求头', () => {
  const c = {
  ...defaults,

test/request/request.test.ts

@@ -11,6 +11,41 @@ import { request } from '@/request/request';
 import axios from '@/axios';
 
 describe('src/request/request.ts', () => {
+ test('应该支持转换 URL', () => {
+ const c1 = {
+ adapter(config: AnyObject) {
+ expect(config.url).toBe('http://api.com/test');
+ },
+ baseURL: 'http://api.com',
+ url: 'test',
+ };
+ const c2 = {
+ adapter(config: AnyObject) {
+ expect(config.url).toBe('http://api.com/test/1');
+ },
+ baseURL: 'http://api.com',
+ url: 'test/:id',
+ params: {
+ id: 1,
+ },
+ };
+ const c3 = {
+ adapter(config: AnyObject) {
+ expect(config.url).toBe('http://api.com/test/1');
+ },
+ baseURL: 'http://api.com',
+ url: 'test/:id',
+ method: 'post' as const,
+ data: {
+ id: 1,
+ },
+ };
+
+ request(c1);
+ request(c2);
+ request(c3);
+ });
+
  testEachMethods('%s 方法应该返回正确的响应体结构', (k) => {
  const c = {
  adapter: mockAdapter(),