Skip to content

Commit

Permalink
fix: fixed type error of ts(4023)
Browse files Browse the repository at this point in the history
  • Loading branch information
JOU-amjs committed Nov 10, 2023
1 parent 28659ed commit 74a9cf9
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions src/mockResponse.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { MockError, MockResponse } from '@alova/mock';
import { AxiosError, AxiosHeaders, AxiosResponse } from 'axios';
import { AxiosError, AxiosHeaders, AxiosResponse, AxiosResponseHeaders } from 'axios';
import { AlovaAxiosRequestConfig } from '../typings';
import { undefinedValue } from './helper';

const mockResponseHandler: MockResponse<AlovaAxiosRequestConfig, AxiosResponse, AxiosResponse['headers']> = (
const mockResponseHandler: MockResponse<AlovaAxiosRequestConfig, AxiosResponse, AxiosResponseHeaders> = (
{ status, statusText, body },
_,
currentMethod
Expand Down Expand Up @@ -31,7 +31,7 @@ const mockResponseHandler: MockResponse<AlovaAxiosRequestConfig, AxiosResponse,
}
return {
response: axiosResponse,
headers: responseHeaders
headers: responseHeaders as AxiosResponseHeaders
};
};

Expand Down
4 changes: 2 additions & 2 deletions src/requestAdapter.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ProgressUpdater } from 'alova';
import axios from 'axios';
import axios, { AxiosResponseHeaders } from 'axios';
import { AdapterCreateOptions, AxiosRequestAdapter } from '../typings';
import { noop, undefinedValue } from './helper';

Expand Down Expand Up @@ -38,7 +38,7 @@ export default function requestAdapter(options: AdapterCreateOptions = {}) {

return {
response: () => responsePromise,
headers: () => responsePromise.then(res => res.headers),
headers: () => responsePromise.then(res => res.headers as AxiosResponseHeaders),
abort: () => {
controller.abort();
},
Expand Down
2 changes: 1 addition & 1 deletion test/browser/mockResponse.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import vueHook from 'alova/vue';
import { AxiosError, AxiosResponse } from 'axios';
import { readFileSync } from 'fs';
import path from 'path';
import { axiosMockResponse, axiosRequestAdapter } from '../../src/index';
import { axiosMockResponse, axiosRequestAdapter } from '../../src';

const mocks = defineMock({
'/unit-test': () => {
Expand Down
4 changes: 2 additions & 2 deletions typings/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { MockError } from '@alova/mock';
import { AlovaRequestAdapter } from 'alova';
import { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
import { AxiosInstance, AxiosRequestConfig, AxiosResponse, AxiosResponseHeaders } from 'axios';

/**
* axios请求配置参数
Expand All @@ -27,7 +27,7 @@ export type AxiosRequestAdapter = AlovaRequestAdapter<
any,
AlovaAxiosRequestConfig,
AxiosResponse,
AxiosResponse['headers']
AxiosResponseHeaders
>;

interface AdapterCreateOptions {
Expand Down

0 comments on commit 74a9cf9

Please sign in to comment.