Skip to content

Commit a9126d0

Browse files
committed
refactor: increase line width to 140
1 parent 570e2d9 commit a9126d0

23 files changed

+69
-232
lines changed

biome.jsonc

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,7 @@
88
},
99
"files": {
1010
"ignoreUnknown": true,
11-
"ignore": [
12-
"node_modules",
13-
"package-lock.json",
14-
"dist",
15-
"coverage",
16-
"build",
17-
"out",
18-
".docusaurus",
19-
"*.gen.ts",
20-
"mockServiceWorker.js"
21-
]
11+
"ignore": ["node_modules", "package-lock.json", "dist", "coverage", "build", "out", ".docusaurus", "*.gen.ts", "mockServiceWorker.js"]
2212
},
2313
"organizeImports": {
2414
"enabled": true
@@ -37,15 +27,15 @@
3727
"json": {
3828
"formatter": {
3929
"enabled": true,
40-
"lineWidth": 120
30+
"lineWidth": 140
4131
}
4232
},
4333
"formatter": {
4434
"enabled": true,
4535
"indentStyle": "space",
4636
"indentWidth": 2,
4737
"lineEnding": "lf",
48-
"lineWidth": 120
38+
"lineWidth": 140
4939
},
5040
"linter": {
5141
"enabled": true,
@@ -63,10 +53,7 @@
6353
"useExhaustiveDependencies": {
6454
"level": "error",
6555
"options": {
66-
"hooks": [
67-
{ "name": "useStableCallback", "stableResult": true },
68-
{ "name": "useStableValue", "stableResult": true }
69-
]
56+
"hooks": [{ "name": "useStableCallback", "stableResult": true }, { "name": "useStableValue", "stableResult": true }]
7057
}
7158
}
7259
},

examples/vite/src/App.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,7 @@ function App() {
8383
const posts = postsQuery.useQuery({}, { enabled: !postId });
8484
const reset = resetMutation.useMutation();
8585

86-
const deleteErrors = deletePostMutation.useMutationState(
87-
undefined,
88-
{ status: 'error' },
89-
(x) => x.state.variables?.params.id,
90-
);
86+
const deleteErrors = deletePostMutation.useMutationState(undefined, { status: 'error' }, (x) => x.state.variables?.params.id);
9187

9288
const [refresh] = useOperateOnTags({ tags: 'refreshable' });
9389

examples/vite/src/mocks.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,7 @@ const handlers = [
167167
http.delete(`${baseUrl}/posts/:id`, async (req) => {
168168
await delay(1000);
169169
const { id } = req.params;
170-
if (id === '7' && Math.random() > 0.1)
171-
return HttpResponse.json({ error: '[Mock] Failed to delete' }, { status: 500 });
170+
if (id === '7' && Math.random() > 0.1) return HttpResponse.json({ error: '[Mock] Failed to delete' }, { status: 500 });
172171

173172
const postIndex = posts.findIndex((post) => post.id === Number(id));
174173
if (postIndex === -1) return HttpResponse.json({ error: 'Not found' }, { status: 404 });

scripts/copyPackageJson.ts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,7 @@ copyFileSync('./README.md', './dist/README.md');
44
copyFileSync('./LICENSE', './dist/LICENSE');
55

66
const content = readFileSync('./package.json', 'utf-8');
7-
const {
8-
scripts,
9-
devDependencies,
10-
private: _,
11-
overrides,
12-
volta,
13-
'lint-staged': __,
14-
workspaces,
15-
...parsed
16-
}: any = JSON.parse(content);
7+
const { scripts, devDependencies, private: _, overrides, volta, 'lint-staged': __, workspaces, ...parsed }: any = JSON.parse(content);
178

189
function replacePath(path: string) {
1910
return path.replace(/^\.\/dist\//, './');

src/builder/HttpMutationBuilder.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ export class HttpMutationBuilder<
2020
protected declare _vars: HttpBuilderVars<TParam, TSearch, TBody, THeader, TMeta>;
2121

2222
constructor(
23-
config?: WithOptional<
24-
MutationBuilderConfig<HttpBuilderVars<TParam, TSearch, TBody, THeader, TMeta>, TData, TError, TKey>,
25-
'queryFn'
26-
>,
23+
config?: WithOptional<MutationBuilderConfig<HttpBuilderVars<TParam, TSearch, TBody, THeader, TMeta>, TData, TError, TKey>, 'queryFn'>,
2724
) {
2825
const mergeVars = config?.mergeVars || createHttpMergeVarsFn();
2926
const queryFn = config?.queryFn || createHttpQueryFn(mergeVars);

src/builder/HttpQueryBuilder.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ export class HttpQueryBuilder<
1919
protected declare _vars: HttpBuilderVars<TParam, TSearch, TBody, THeader, TMeta>;
2020

2121
constructor(
22-
config?: WithOptional<
23-
QueryBuilderConfig<HttpBuilderVars<TParam, TSearch, TBody, THeader, TMeta>, TData, TError, TKey>,
24-
'queryFn'
25-
>,
22+
config?: WithOptional<QueryBuilderConfig<HttpBuilderVars<TParam, TSearch, TBody, THeader, TMeta>, TData, TError, TKey>, 'queryFn'>,
2623
) {
2724
const mergeVars = config?.mergeVars || createHttpMergeVarsFn();
2825
const queryFn = config?.queryFn || createHttpQueryFn(mergeVars);

src/builder/MutationBuilder.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@ import { MiddlewareFn, createMiddlewareFunction } from './createMiddlewareFuncti
44
import { createUpdateMiddleware } from './createUpdateMiddleware';
55
import { mergeVars } from './utils';
66

7-
export class MutationBuilder<TVars, TData, TError, TKey extends unknown[]> extends MutationBuilderFrozen<
8-
TVars,
9-
TData,
10-
TError,
11-
TKey
12-
> {
7+
export class MutationBuilder<TVars, TData, TError, TKey extends unknown[]> extends MutationBuilderFrozen<TVars, TData, TError, TKey> {
138
withVars<TVars$ = TVars, const TReset extends boolean = false>(
149
vars?: TVars$,
1510
resetVars = false as TReset,

src/builder/MutationBuilderFrozen.ts

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,7 @@ import {
1515
import { BuilderConfig } from './types';
1616
import { areKeysEqual, getRandomKey, mergeMutationOptions, mergeVars } from './utils';
1717

18-
export type MutationBuilderConfig<TVars, TData, TError, TKey extends unknown[]> = BuilderConfig<
19-
TVars,
20-
TData,
21-
TError,
22-
TKey
23-
> & {
18+
export type MutationBuilderConfig<TVars, TData, TError, TKey extends unknown[]> = BuilderConfig<TVars, TData, TError, TKey> & {
2419
options?: UseMutationOptions<TData, TError, TVars>;
2520
};
2621

@@ -34,10 +29,7 @@ export class MutationBuilderFrozen<TVars, TData, TError, TKey extends unknown[]>
3429
public mutationKeyPrefix = getRandomKey(),
3530
) {}
3631

37-
protected mergeConfigs: (config: typeof this._config, other: Partial<typeof this._config>) => typeof this._config = (
38-
config,
39-
other,
40-
) => {
32+
protected mergeConfigs: (config: typeof this._config, other: Partial<typeof this._config>) => typeof this._config = (config, other) => {
4133
return {
4234
...config,
4335
...other,
@@ -67,10 +59,10 @@ export class MutationBuilderFrozen<TVars, TData, TError, TKey extends unknown[]>
6759
return [this.mutationKeyPrefix];
6860
};
6961

70-
getMutationOptions: (
71-
queryClient: QueryClient,
72-
opts?: typeof this._options,
73-
) => UseMutationOptions<TData, TError, TVars> = (queryClient, opts) => {
62+
getMutationOptions: (queryClient: QueryClient, opts?: typeof this._options) => UseMutationOptions<TData, TError, TVars> = (
63+
queryClient,
64+
opts,
65+
) => {
7466
return mergeMutationOptions([
7567
{
7668
mutationKey: this.getMutationKey(),
@@ -81,22 +73,18 @@ export class MutationBuilderFrozen<TVars, TData, TError, TKey extends unknown[]>
8173
]);
8274
};
8375

84-
getMutationFilters: (
85-
vars?: TVars,
86-
filters?: MutationFilters<TData, TError, TVars>,
87-
) => MutationFilters<any, any, any> = (vars, filters) => {
76+
getMutationFilters: (vars?: TVars, filters?: MutationFilters<TData, TError, TVars>) => MutationFilters<any, any, any> = (
77+
vars,
78+
filters,
79+
) => {
8880
return {
8981
mutationKey: this.getMutationKey(),
9082
...filters,
9183
predicate: (m) => {
9284
if (filters?.predicate && !filters.predicate(m)) return false;
9385
if (vars == null) return true;
9486
if (!m.state.variables) return false;
95-
return areKeysEqual(
96-
[m.state.variables],
97-
[vars],
98-
this.config.queryKeyHashFn as QueryKeyHashFunction<readonly unknown[]>,
99-
);
87+
return areKeysEqual([m.state.variables], [vars], this.config.queryKeyHashFn as QueryKeyHashFunction<readonly unknown[]>);
10088
},
10189
};
10290
};
@@ -115,10 +103,7 @@ export class MutationBuilderFrozen<TVars, TData, TError, TKey extends unknown[]>
115103
filters?: MutationFilters<TData, TError, TVars>,
116104
select?: (mt: Mutation<TData, TError, TVars>) => TSelect,
117105
) => TSelect[] = (vars, filters, select) => {
118-
return useMutationState(
119-
{ filters: this.getMutationFilters(vars, filters), select: select as any },
120-
this.config.queryClient,
121-
);
106+
return useMutationState({ filters: this.getMutationFilters(vars, filters), select: select as any }, this.config.queryClient);
122107
};
123108

124109
readonly getMutation = (vars?: TVars, filters?: MutationFilters<TData, TError, TVars>, queryClient?: QueryClient) => {

src/builder/QueryBuilder.ts

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ import { PreprocessorFn, createPreprocessorFunction, identityPreprocessor } from
77
import { createTagMiddleware } from './createTagMiddleware';
88
import { mergeVars } from './utils';
99

10-
export class QueryBuilder<TVars, TData, TError, TKey extends unknown[]> extends QueryBuilderFrozen<
11-
TVars,
12-
TData,
13-
TError,
14-
TKey
15-
> {
10+
export class QueryBuilder<TVars, TData, TError, TKey extends unknown[]> extends QueryBuilderFrozen<TVars, TData, TError, TKey> {
1611
withVars<TVars$ = TVars, const TReset extends boolean = false>(
1712
vars?: TVars$,
1813
resetVars = false as TReset,
@@ -39,13 +34,9 @@ export class QueryBuilder<TVars, TData, TError, TKey extends unknown[]> extends
3934
}
4035

4136
withPreprocessor(preprocessor: PreprocessorFn<TVars, TVars>): this;
42-
withPreprocessor<TVars$ = TVars>(
43-
preprocessor: PreprocessorFn<TVars$, TVars>,
44-
): QueryBuilder<TVars$, TData, TError, TKey>;
37+
withPreprocessor<TVars$ = TVars>(preprocessor: PreprocessorFn<TVars$, TVars>): QueryBuilder<TVars$, TData, TError, TKey>;
4538

46-
withPreprocessor<TVars$ = TVars>(
47-
preprocessor: PreprocessorFn<TVars$, TVars>,
48-
): QueryBuilder<TVars$, TData, TError, TKey> {
39+
withPreprocessor<TVars$ = TVars>(preprocessor: PreprocessorFn<TVars$, TVars>): QueryBuilder<TVars$, TData, TError, TKey> {
4940
const newBuilder = this as unknown as QueryBuilder<TVars$, TData, TError, TKey>;
5041

5142
return newBuilder.withConfig({

src/builder/QueryBuilderClient.ts

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,7 @@
1-
import type {
2-
CancelOptions,
3-
InvalidateOptions,
4-
QueryFilters,
5-
RefetchOptions,
6-
ResetOptions,
7-
SetDataOptions,
8-
} from '@tanstack/react-query';
1+
import type { CancelOptions, InvalidateOptions, QueryFilters, RefetchOptions, ResetOptions, SetDataOptions } from '@tanstack/react-query';
92
import { QueryBuilderConfig, QueryBuilderFrozen } from './QueryBuilderFrozen';
103

11-
export class QueryBuilderClient<
12-
TVars,
13-
TData,
14-
TError,
15-
TKey extends unknown[],
16-
TFilters = QueryFilters<TData, TError, TData, TKey>,
17-
> {
4+
export class QueryBuilderClient<TVars, TData, TError, TKey extends unknown[], TFilters = QueryFilters<TData, TError, TData, TKey>> {
185
private declare _options: QueryBuilderConfig<TVars, TData, TError, TKey>['options'];
196
constructor(private builder: QueryBuilderFrozen<TVars, TData, TError, TKey>) {}
207

@@ -45,14 +32,12 @@ export class QueryBuilderClient<
4532
readonly invalidate = (vars: TVars, filters?: TFilters, opts?: InvalidateOptions) =>
4633
this.builder.config.queryClient?.invalidateQueries({ queryKey: this.builder.getQueryKey(vars), ...filters }, opts);
4734

48-
readonly getData = (vars: TVars) =>
49-
this.builder.config.queryClient?.getQueryData<TData>(this.builder.getQueryKey(vars));
35+
readonly getData = (vars: TVars) => this.builder.config.queryClient?.getQueryData<TData>(this.builder.getQueryKey(vars));
5036

5137
readonly setData = (vars: TVars, updater: SetDataUpdater<TData>, opts?: SetDataOptions) =>
5238
this.builder.config.queryClient?.setQueryData<TData>(this.builder.getQueryKey(vars), updater, opts);
5339

54-
readonly getState = (vars: TVars) =>
55-
this.builder.config.queryClient?.getQueryState<TData, TError>(this.builder.getQueryKey(vars));
40+
readonly getState = (vars: TVars) => this.builder.config.queryClient?.getQueryState<TData, TError>(this.builder.getQueryKey(vars));
5641
}
5742

5843
type SetDataUpdater<T> = T | undefined | ((oldData: T | undefined) => T | undefined);

0 commit comments

Comments
 (0)