Skip to content

Commit 960a38a

Browse files
tomerbtomerb
authored
🎨 Run biome after OpenAPI client generation (#1226)
1 parent dabeff7 commit 960a38a

File tree

13 files changed

+1482
-1436
lines changed

13 files changed

+1482
-1436
lines changed

‎frontend/biome.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"enabled": true
55
},
66
"files": {
7-
"ignore": ["node_modules", "src/client/", "src/routeTree.gen.ts"]
7+
"ignore": ["node_modules", "src/routeTree.gen.ts"]
88
},
99
"linter": {
1010
"enabled": true,

‎frontend/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"build": "tsc && vite build",
99
"lint": "biome check --apply-unsafe --no-errors-on-unmatched --files-ignore-unknown=true ./",
1010
"preview": "vite preview",
11-
"generate-client": "openapi-ts --input ./openapi.json --output ./src/client --client axios --exportSchemas true"
11+
"generate-client": "openapi-ts --input ./openapi.json --output ./src/client --client axios --exportSchemas true && biome format --write ./src/client"
1212
},
1313
"dependencies": {
1414
"@chakra-ui/icons": "2.1.1",

‎frontend/src/client/core/ApiError.ts‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
import type { ApiRequestOptions } from './ApiRequestOptions';
2-
import type { ApiResult } from './ApiResult';
1+
import type { ApiRequestOptions } from "./ApiRequestOptions"
2+
import type { ApiResult } from "./ApiResult"
33

44
export class ApiError extends Error {
5-
public readonly url: string;
6-
public readonly status: number;
7-
public readonly statusText: string;
8-
public readonly body: unknown;
9-
public readonly request: ApiRequestOptions;
5+
public readonly url: string
6+
public readonly status: number
7+
public readonly statusText: string
8+
public readonly body: unknown
9+
public readonly request: ApiRequestOptions
1010

11-
constructor(request: ApiRequestOptions, response: ApiResult, message: string) {
12-
super(message);
11+
constructor(
12+
request: ApiRequestOptions,
13+
response: ApiResult,
14+
message: string,
15+
) {
16+
super(message)
1317

14-
this.name = 'ApiError';
15-
this.url = response.url;
16-
this.status = response.status;
17-
this.statusText = response.statusText;
18-
this.body = response.body;
19-
this.request = request;
20-
}
21-
}
18+
this.name = "ApiError"
19+
this.url = response.url
20+
this.status = response.status
21+
this.statusText = response.statusText
22+
this.body = response.body
23+
this.request = request
24+
}
25+
}

‎frontend/src/client/core/ApiRequestOptions.ts‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
export type ApiRequestOptions = {
2-
readonly method: 'GET' | 'PUT' | 'POST' | 'DELETE' | 'OPTIONS' | 'HEAD' | 'PATCH';
3-
readonly url: string;
4-
readonly path?: Record<string, unknown>;
5-
readonly cookies?: Record<string, unknown>;
6-
readonly headers?: Record<string, unknown>;
7-
readonly query?: Record<string, unknown>;
8-
readonly formData?: Record<string, unknown>;
9-
readonly body?: any;
10-
readonly mediaType?: string;
11-
readonly responseHeader?: string;
12-
readonly errors?: Record<number, string>;
13-
};
2+
readonly method:
3+
| "GET"
4+
| "PUT"
5+
| "POST"
6+
| "DELETE"
7+
| "OPTIONS"
8+
| "HEAD"
9+
| "PATCH"
10+
readonly url: string
11+
readonly path?: Record<string, unknown>
12+
readonly cookies?: Record<string, unknown>
13+
readonly headers?: Record<string, unknown>
14+
readonly query?: Record<string, unknown>
15+
readonly formData?: Record<string, unknown>
16+
readonly body?: any
17+
readonly mediaType?: string
18+
readonly responseHeader?: string
19+
readonly errors?: Record<number, string>
20+
}

‎frontend/src/client/core/ApiResult.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export type ApiResult<TData = any> = {
2-
readonly body: TData;
3-
readonly ok: boolean;
4-
readonly status: number;
5-
readonly statusText: string;
6-
readonly url: string;
7-
};
2+
readonly body: TData
3+
readonly ok: boolean
4+
readonly status: number
5+
readonly statusText: string
6+
readonly url: string
7+
}

‎frontend/src/client/core/CancelablePromise.ts‎

Lines changed: 118 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,126 @@
11
export class CancelError extends Error {
2-
constructor(message: string) {
3-
super(message);
4-
this.name = 'CancelError';
5-
}
6-
7-
public get isCancelled(): boolean {
8-
return true;
9-
}
2+
constructor(message: string) {
3+
super(message)
4+
this.name = "CancelError"
5+
}
6+
7+
public get isCancelled(): boolean {
8+
return true
9+
}
1010
}
1111

1212
export interface OnCancel {
13-
readonly isResolved: boolean;
14-
readonly isRejected: boolean;
15-
readonly isCancelled: boolean;
13+
readonly isResolved: boolean
14+
readonly isRejected: boolean
15+
readonly isCancelled: boolean
1616

17-
(cancelHandler: () => void): void;
17+
(cancelHandler: () => void): void
1818
}
1919

2020
export class CancelablePromise<T> implements Promise<T> {
21-
private _isResolved: boolean;
22-
private _isRejected: boolean;
23-
private _isCancelled: boolean;
24-
readonly cancelHandlers: (() => void)[];
25-
readonly promise: Promise<T>;
26-
private _resolve?: (value: T | PromiseLike<T>) => void;
27-
private _reject?: (reason?: unknown) => void;
28-
29-
constructor(
30-
executor: (
31-
resolve: (value: T | PromiseLike<T>) => void,
32-
reject: (reason?: unknown) => void,
33-
onCancel: OnCancel
34-
) => void
35-
) {
36-
this._isResolved = false;
37-
this._isRejected = false;
38-
this._isCancelled = false;
39-
this.cancelHandlers = [];
40-
this.promise = new Promise<T>((resolve, reject) => {
41-
this._resolve = resolve;
42-
this._reject = reject;
43-
44-
const onResolve = (value: T | PromiseLike<T>): void => {
45-
if (this._isResolved || this._isRejected || this._isCancelled) {
46-
return;
47-
}
48-
this._isResolved = true;
49-
if (this._resolve) this._resolve(value);
50-
};
51-
52-
const onReject = (reason?: unknown): void => {
53-
if (this._isResolved || this._isRejected || this._isCancelled) {
54-
return;
55-
}
56-
this._isRejected = true;
57-
if (this._reject) this._reject(reason);
58-
};
59-
60-
const onCancel = (cancelHandler: () => void): void => {
61-
if (this._isResolved || this._isRejected || this._isCancelled) {
62-
return;
63-
}
64-
this.cancelHandlers.push(cancelHandler);
65-
};
66-
67-
Object.defineProperty(onCancel, 'isResolved', {
68-
get: (): boolean => this._isResolved,
69-
});
70-
71-
Object.defineProperty(onCancel, 'isRejected', {
72-
get: (): boolean => this._isRejected,
73-
});
74-
75-
Object.defineProperty(onCancel, 'isCancelled', {
76-
get: (): boolean => this._isCancelled,
77-
});
78-
79-
return executor(onResolve, onReject, onCancel as OnCancel);
80-
});
81-
}
82-
83-
get [Symbol.toStringTag]() {
84-
return "Cancellable Promise";
85-
}
86-
87-
public then<TResult1 = T, TResult2 = never>(
88-
onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null,
89-
onRejected?: ((reason: unknown) => TResult2 | PromiseLike<TResult2>) | null
90-
): Promise<TResult1 | TResult2> {
91-
return this.promise.then(onFulfilled, onRejected);
92-
}
93-
94-
public catch<TResult = never>(
95-
onRejected?: ((reason: unknown) => TResult | PromiseLike<TResult>) | null
96-
): Promise<T | TResult> {
97-
return this.promise.catch(onRejected);
98-
}
99-
100-
public finally(onFinally?: (() => void) | null): Promise<T> {
101-
return this.promise.finally(onFinally);
102-
}
103-
104-
public cancel(): void {
105-
if (this._isResolved || this._isRejected || this._isCancelled) {
106-
return;
107-
}
108-
this._isCancelled = true;
109-
if (this.cancelHandlers.length) {
110-
try {
111-
for (const cancelHandler of this.cancelHandlers) {
112-
cancelHandler();
113-
}
114-
} catch (error) {
115-
console.warn('Cancellation threw an error', error);
116-
return;
117-
}
118-
}
119-
this.cancelHandlers.length = 0;
120-
if (this._reject) this._reject(new CancelError('Request aborted'));
121-
}
122-
123-
public get isCancelled(): boolean {
124-
return this._isCancelled;
125-
}
126-
}
21+
private _isResolved: boolean
22+
private _isRejected: boolean
23+
private _isCancelled: boolean
24+
readonly cancelHandlers: (() => void)[]
25+
readonly promise: Promise<T>
26+
private _resolve?: (value: T | PromiseLike<T>) => void
27+
private _reject?: (reason?: unknown) => void
28+
29+
constructor(
30+
executor: (
31+
resolve: (value: T | PromiseLike<T>) => void,
32+
reject: (reason?: unknown) => void,
33+
onCancel: OnCancel,
34+
) => void,
35+
) {
36+
this._isResolved = false
37+
this._isRejected = false
38+
this._isCancelled = false
39+
this.cancelHandlers = []
40+
this.promise = new Promise<T>((resolve, reject) => {
41+
this._resolve = resolve
42+
this._reject = reject
43+
44+
const onResolve = (value: T | PromiseLike<T>): void => {
45+
if (this._isResolved || this._isRejected || this._isCancelled) {
46+
return
47+
}
48+
this._isResolved = true
49+
if (this._resolve) this._resolve(value)
50+
}
51+
52+
const onReject = (reason?: unknown): void => {
53+
if (this._isResolved || this._isRejected || this._isCancelled) {
54+
return
55+
}
56+
this._isRejected = true
57+
if (this._reject) this._reject(reason)
58+
}
59+
60+
const onCancel = (cancelHandler: () => void): void => {
61+
if (this._isResolved || this._isRejected || this._isCancelled) {
62+
return
63+
}
64+
this.cancelHandlers.push(cancelHandler)
65+
}
66+
67+
Object.defineProperty(onCancel, "isResolved", {
68+
get: (): boolean => this._isResolved,
69+
})
70+
71+
Object.defineProperty(onCancel, "isRejected", {
72+
get: (): boolean => this._isRejected,
73+
})
74+
75+
Object.defineProperty(onCancel, "isCancelled", {
76+
get: (): boolean => this._isCancelled,
77+
})
78+
79+
return executor(onResolve, onReject, onCancel as OnCancel)
80+
})
81+
}
82+
83+
get [Symbol.toStringTag]() {
84+
return "Cancellable Promise"
85+
}
86+
87+
public then<TResult1 = T, TResult2 = never>(
88+
onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null,
89+
onRejected?: ((reason: unknown) => TResult2 | PromiseLike<TResult2>) | null,
90+
): Promise<TResult1 | TResult2> {
91+
return this.promise.then(onFulfilled, onRejected)
92+
}
93+
94+
public catch<TResult = never>(
95+
onRejected?: ((reason: unknown) => TResult | PromiseLike<TResult>) | null,
96+
): Promise<T | TResult> {
97+
return this.promise.catch(onRejected)
98+
}
99+
100+
public finally(onFinally?: (() => void) | null): Promise<T> {
101+
return this.promise.finally(onFinally)
102+
}
103+
104+
public cancel(): void {
105+
if (this._isResolved || this._isRejected || this._isCancelled) {
106+
return
107+
}
108+
this._isCancelled = true
109+
if (this.cancelHandlers.length) {
110+
try {
111+
for (const cancelHandler of this.cancelHandlers) {
112+
cancelHandler()
113+
}
114+
} catch (error) {
115+
console.warn("Cancellation threw an error", error)
116+
return
117+
}
118+
}
119+
this.cancelHandlers.length = 0
120+
if (this._reject) this._reject(new CancelError("Request aborted"))
121+
}
122+
123+
public get isCancelled(): boolean {
124+
return this._isCancelled
125+
}
126+
}

0 commit comments

Comments
 (0)