Skip to content

Commit 9a62b38

Browse files
benny-eubenny-eu
committed
style(.prettierrc): change printWidth to 80
1 parent 5c7af12 commit 9a62b38

11 files changed

+163
-44
lines changed

‎.prettierrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"singleQuote": true,
33
"trailingComma": "all",
4-
"printWidth": 100,
4+
"printWidth": 80,
55
"proseWrap": "never",
66
"arrowParens": "avoid"
77
}

‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"dev": "webpack serve --config ./build/webpack.config.js",
1515
"clean": "rimraf dist/*",
1616
"test": "jest --coverage",
17-
"lint": "eslint -c ./.eslintrc.js './{src,scripts,build}/**/*.{js,ts,tsx}'"
17+
"lint": "eslint -c ./.eslintrc.js './{src,scripts,build}/**/*.{js,ts,tsx}'",
18+
"prettier": "prettier -w '**/*.ts?(x)'"
1819
},
1920
"husky": {
2021
"hooks": {

‎src/__tests__/cache.test.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
import { CacheDataType, clearCache, getCache, setCache } from '../core/utils/cache';
1+
import {
2+
CacheDataType,
3+
clearCache,
4+
getCache,
5+
setCache,
6+
} from '../core/utils/cache';
27
import { waitForTime } from './utils';
38

49
describe('utils', () => {

‎src/__tests__/index.test.tsx

+81-21
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ import { useRequest } from '../index';
66
import { clearGlobalOptions, setGlobalOptions } from '../core/config';
77
import { clearCache } from '../core/utils/cache';
88
import { waitForAll, waitForTime } from './utils';
9-
import { RECONNECT_LISTENER, FOCUS_LISTENER, VISIBLE_LISTENER } from '../core/utils/listener';
9+
import {
10+
RECONNECT_LISTENER,
11+
FOCUS_LISTENER,
12+
VISIBLE_LISTENER,
13+
} from '../core/utils/listener';
1014
declare let jsdom: any;
1115

1216
describe('useRequest', () => {
@@ -136,7 +140,9 @@ describe('useRequest', () => {
136140
setup() {
137141
const { data, run } = useRequest(request, { manual: true });
138142

139-
return () => <button onClick={() => run()}>{`data:${data.value}`}</button>;
143+
return () => (
144+
<button onClick={() => run()}>{`data:${data.value}`}</button>
145+
);
140146
},
141147
}),
142148
);
@@ -183,7 +189,9 @@ describe('useRequest', () => {
183189
const { data, run } = useRequest(request);
184190

185191
return () => (
186-
<button onClick={() => run('hello', 'world')}>{`data:${data.value}`}</button>
192+
<button
193+
onClick={() => run('hello', 'world')}
194+
>{`data:${data.value}`}</button>
187195
);
188196
},
189197
}),
@@ -201,7 +209,9 @@ describe('useRequest', () => {
201209
setup() {
202210
const { data, mutate } = useRequest(request);
203211

204-
return () => <button onClick={() => mutate('ok')}>{`data:${data.value}`}</button>;
212+
return () => (
213+
<button onClick={() => mutate('ok')}>{`data:${data.value}`}</button>
214+
);
205215
},
206216
}),
207217
);
@@ -217,7 +227,11 @@ describe('useRequest', () => {
217227
setup() {
218228
const { data, mutate } = useRequest(request);
219229

220-
return () => <button onClick={() => mutate(() => 'ok')}>{`data:${data.value}`}</button>;
230+
return () => (
231+
<button
232+
onClick={() => mutate(() => 'ok')}
233+
>{`data:${data.value}`}</button>
234+
);
221235
},
222236
}),
223237
);
@@ -233,7 +247,11 @@ describe('useRequest', () => {
233247
setup() {
234248
const { refresh, loading } = useRequest(request);
235249

236-
return () => <button onClick={() => refresh()}>{`loading:${loading.value}`}</button>;
250+
return () => (
251+
<button
252+
onClick={() => refresh()}
253+
>{`loading:${loading.value}`}</button>
254+
);
237255
},
238256
}),
239257
);
@@ -551,7 +569,11 @@ describe('useRequest', () => {
551569
loadingDelay: 800,
552570
});
553571

554-
return () => <button onClick={() => cancel()}>{`loading:${loading.value}`}</button>;
572+
return () => (
573+
<button
574+
onClick={() => cancel()}
575+
>{`loading:${loading.value}`}</button>
576+
);
555577
},
556578
}),
557579
);
@@ -627,7 +649,11 @@ describe('useRequest', () => {
627649
pollingInterval: 500,
628650
});
629651

630-
return () => <button onClick={() => cancel()}>{`loading:${loading.value}`}</button>;
652+
return () => (
653+
<button
654+
onClick={() => cancel()}
655+
>{`loading:${loading.value}`}</button>
656+
);
631657
},
632658
}),
633659
);
@@ -652,7 +678,11 @@ describe('useRequest', () => {
652678
pollingInterval: -0.1,
653679
});
654680

655-
return () => <button onClick={() => cancel()}>{`loading:${loading.value}`}</button>;
681+
return () => (
682+
<button
683+
onClick={() => cancel()}
684+
>{`loading:${loading.value}`}</button>
685+
);
656686
},
657687
}),
658688
);
@@ -756,7 +786,9 @@ describe('useRequest', () => {
756786
refreshOnWindowFocus: true,
757787
});
758788

759-
return () => <button onClick={() => run()}>{`data:${data.value}`}</button>;
789+
return () => (
790+
<button onClick={() => run()}>{`data:${data.value}`}</button>
791+
);
760792
},
761793
}),
762794
);
@@ -791,7 +823,9 @@ describe('useRequest', () => {
791823
focusTimespan: 3000,
792824
});
793825

794-
return () => <button onClick={() => run()}>{`data:${data.value}`}</button>;
826+
return () => (
827+
<button onClick={() => run()}>{`data:${data.value}`}</button>
828+
);
795829
},
796830
}),
797831
);
@@ -908,7 +942,9 @@ describe('useRequest', () => {
908942
cacheKey: 'cacheKey',
909943
cacheTime: 10000,
910944
});
911-
return () => <button onClick={() => run((count += 1))}>{data.value}</button>;
945+
return () => (
946+
<button onClick={() => run((count += 1))}>{data.value}</button>
947+
);
912948
},
913949
});
914950

@@ -951,7 +987,9 @@ describe('useRequest', () => {
951987
cacheKey: 'cacheKey',
952988
staleTime: 5000,
953989
});
954-
return () => <button onClick={() => run((count += 1))}>{data.value}</button>;
990+
return () => (
991+
<button onClick={() => run((count += 1))}>{data.value}</button>
992+
);
955993
},
956994
});
957995
let wrapper = shallowMount(TestComponent);
@@ -1062,8 +1100,14 @@ describe('useRequest', () => {
10621100
<div id="loading">{loading.value.toString()}</div>
10631101
<ul>
10641102
{users.map(item => (
1065-
<li key={item.id} id={item.username} onClick={() => run(item.id)}>
1066-
{queries[item.id]?.loading.value ? 'loading' : item.username}
1103+
<li
1104+
key={item.id}
1105+
id={item.username}
1106+
onClick={() => run(item.id)}
1107+
>
1108+
{queries[item.id]?.loading.value
1109+
? 'loading'
1110+
: item.username}
10671111
</li>
10681112
))}
10691113
</ul>
@@ -1110,7 +1154,11 @@ describe('useRequest', () => {
11101154
<div>
11111155
<ul id="child">
11121156
{users.map(item => (
1113-
<li key={item.id} id={item.username} onClick={() => run(item.id)}>
1157+
<li
1158+
key={item.id}
1159+
id={item.username}
1160+
onClick={() => run(item.id)}
1161+
>
11141162
{queries[item.id]?.loading.value ? 'loading' : item.username}
11151163
</li>
11161164
))}
@@ -1183,7 +1231,9 @@ describe('useRequest', () => {
11831231
errorRetryInterval: 1000,
11841232
});
11851233
const handleClick = () => run();
1186-
return () => <button onClick={handleClick}>{`${loading.value}`}</button>;
1234+
return () => (
1235+
<button onClick={handleClick}>{`${loading.value}`}</button>
1236+
);
11871237
},
11881238
}),
11891239
);
@@ -1216,7 +1266,9 @@ describe('useRequest', () => {
12161266
errorRetryCount: 3,
12171267
errorRetryInterval: 1000,
12181268
});
1219-
return () => <button onClick={() => cancel()}>{`${loading.value}`}</button>;
1269+
return () => (
1270+
<button onClick={() => cancel()}>{`${loading.value}`}</button>
1271+
);
12201272
},
12211273
}),
12221274
);
@@ -1261,7 +1313,11 @@ describe('useRequest', () => {
12611313
errorRetryInterval: 600,
12621314
pollingInterval: 500,
12631315
});
1264-
return () => <button>{`${loading.value || data.value || error.value?.message}`}</button>;
1316+
return () => (
1317+
<button>{`${
1318+
loading.value || data.value || error.value?.message
1319+
}`}</button>
1320+
);
12651321
},
12661322
}),
12671323
);
@@ -1300,7 +1356,9 @@ describe('useRequest', () => {
13001356
const { loading, error } = useRequest(failedRequest, {
13011357
pollingInterval: 1000,
13021358
});
1303-
return () => <button>{`${loading.value || error.value?.message}`}</button>;
1359+
return () => (
1360+
<button>{`${loading.value || error.value?.message}`}</button>
1361+
);
13041362
},
13051363
}),
13061364
);
@@ -1322,7 +1380,9 @@ describe('useRequest', () => {
13221380
pollingInterval: 500,
13231381
errorRetryInterval: 600,
13241382
});
1325-
return () => <button>{`${loading.value || error.value?.message}`}</button>;
1383+
return () => (
1384+
<button>{`${loading.value || error.value?.message}`}</button>
1385+
);
13261386
},
13271387
}),
13281388
);

‎src/core/config.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ export type FormatOptions<R, P extends unknown[], FR> = {
5151
formatResult: (data: R) => FR;
5252
} & BaseOptions<FR, P>;
5353

54-
export type MixinOptions<R, P extends unknown[], FR> = BaseOptions<R, P> | FormatOptions<R, P, FR>;
54+
export type MixinOptions<R, P extends unknown[], FR> =
55+
| BaseOptions<R, P>
56+
| FormatOptions<R, P, FR>;
5557

5658
export type Config<R, P extends unknown[]> = Omit<
5759
BaseOptions<R, P>,

‎src/core/createQuery.ts

+23-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ import throttle from 'lodash/throttle';
33
import { nextTick, Ref, ref } from 'vue';
44
import { Config } from './config';
55
import { Queries } from './useAsyncQuery';
6-
import { isDocumentVisibilty, isFunction, isNil, isOnline, resolvedPromise } from './utils';
6+
import {
7+
isDocumentVisibilty,
8+
isFunction,
9+
isNil,
10+
isOnline,
11+
resolvedPromise,
12+
} from './utils';
713
import { UnWrapRefObject } from './utils/types';
814
type MutateData<R> = (newData: R) => void;
915
type MutateFunction<R> = (arg: (oldData: R) => R) => void;
@@ -30,15 +36,21 @@ export type QueryState<R, P extends unknown[]> = State<R, P> & {
3036
mutate: Mutate<R>;
3137
};
3238

33-
export type InnerQueryState<R, P extends unknown[]> = Omit<QueryState<R, P>, 'run' | 'queries'> & {
39+
export type InnerQueryState<R, P extends unknown[]> = Omit<
40+
QueryState<R, P>,
41+
'run' | 'queries'
42+
> & {
3443
run: (args: P, cb?: () => void) => InnerRunReturn<R>;
3544
};
3645

3746
const setStateBind = <R, P extends unknown[], T extends State<R, P>>(
3847
oldState: T,
3948
publicCb?: Array<(state: T) => void>,
4049
) => {
41-
return (newState: Partial<UnWrapRefObject<State<R, P>>>, cb?: (state: T) => void) => {
50+
return (
51+
newState: Partial<UnWrapRefObject<State<R, P>>>,
52+
cb?: (state: T) => void,
53+
) => {
4254
Object.keys(newState).forEach(key => {
4355
oldState[key].value = newState[key];
4456
});
@@ -133,7 +145,10 @@ const createQuery = <R, P extends unknown[]>(
133145

134146
let timerId: number;
135147
if (!isNil(pollingInterval) && pollingInterval! >= 0) {
136-
if ((pollingWhenHidden || isDocumentVisibilty()) && (pollingWhenOffline || isOnline())) {
148+
if (
149+
(pollingWhenHidden || isDocumentVisibilty()) &&
150+
(pollingWhenOffline || isOnline())
151+
) {
137152
timerId = setTimeout(pollingFunc, pollingInterval);
138153
} else {
139154
// stop polling
@@ -219,8 +234,10 @@ const createQuery = <R, P extends unknown[]>(
219234
});
220235
};
221236

222-
const debouncedRun = !isNil(debounceInterval) && debounce(_run, debounceInterval);
223-
const throttledRun = !isNil(throttleInterval) && throttle(_run, throttleInterval);
237+
const debouncedRun =
238+
!isNil(debounceInterval) && debounce(_run, debounceInterval);
239+
const throttledRun =
240+
!isNil(throttleInterval) && throttle(_run, throttleInterval);
224241

225242
const run = (args: P, cb?: () => void) => {
226243
clearAllTimer();

0 commit comments

Comments
 (0)