fork of hey-api/openapi-ts because I need some additional things
fix: more examples
+142
-46
+8
-2
examples/openapi-ts-angular-common/src/client/client/client.gen.ts
+8
-2
examples/openapi-ts-angular-common/src/client/client/client.gen.ts
···
97
97
return { opts, req, url };
98
98
};
99
99
100
-
const beforeRequest = async (options: RequestOptions) => {
100
+
const beforeRequest = async <
101
+
TData = unknown,
102
+
TResponseStyle extends ResponseStyle = 'fields',
103
+
ThrowOnError extends boolean = boolean,
104
+
Url extends string = string,
105
+
>(
106
+
options: RequestOptions<TData, TResponseStyle, ThrowOnError, Url>,
107
+
) => {
101
108
const { opts, req, url } = requestOptions(options);
102
109
103
110
if (opts.security) {
···
115
122
};
116
123
117
124
const request: Client['request'] = async (options) => {
118
-
// @ts-expect-error
119
125
const { opts, req: initialReq } = await beforeRequest(options);
120
126
121
127
let req = initialReq;
+8
-2
examples/openapi-ts-angular/src/client/client/client.gen.ts
+8
-2
examples/openapi-ts-angular/src/client/client/client.gen.ts
···
97
97
return { opts, req, url };
98
98
};
99
99
100
-
const beforeRequest = async (options: RequestOptions) => {
100
+
const beforeRequest = async <
101
+
TData = unknown,
102
+
TResponseStyle extends ResponseStyle = 'fields',
103
+
ThrowOnError extends boolean = boolean,
104
+
Url extends string = string,
105
+
>(
106
+
options: RequestOptions<TData, TResponseStyle, ThrowOnError, Url>,
107
+
) => {
101
108
const { opts, req, url } = requestOptions(options);
102
109
103
110
if (opts.security) {
···
115
122
};
116
123
117
124
const request: Client['request'] = async (options) => {
118
-
// @ts-expect-error
119
125
const { opts, req: initialReq } = await beforeRequest(options);
120
126
121
127
let req = initialReq;
+12
-4
examples/openapi-ts-fastify/src/client/client/client.gen.ts
+12
-4
examples/openapi-ts-fastify/src/client/client/client.gen.ts
···
31
31
32
32
const interceptors = createInterceptors<Request, Response, unknown, ResolvedRequestOptions>();
33
33
34
-
const beforeRequest = async (options: RequestOptions) => {
34
+
const beforeRequest = async <
35
+
TData = unknown,
36
+
TResponseStyle extends 'data' | 'fields' = 'fields',
37
+
ThrowOnError extends boolean = boolean,
38
+
Url extends string = string,
39
+
>(
40
+
options: RequestOptions<TData, TResponseStyle, ThrowOnError, Url>,
41
+
) => {
35
42
const opts = {
36
43
..._config,
37
44
...options,
···
60
67
opts.headers.delete('Content-Type');
61
68
}
62
69
63
-
const url = buildUrl(opts);
70
+
const resolvedOpts = opts as typeof opts &
71
+
ResolvedRequestOptions<TResponseStyle, ThrowOnError, Url>;
72
+
const url = buildUrl(resolvedOpts);
64
73
65
-
return { opts, url };
74
+
return { opts: resolvedOpts, url };
66
75
};
67
76
68
77
const request: Client['request'] = async (options) => {
69
-
// @ts-expect-error
70
78
const { opts, url } = await beforeRequest(options);
71
79
const requestInit: ReqInit = {
72
80
redirect: 'follow',
+12
-4
examples/openapi-ts-fetch/src/client/client/client.gen.ts
+12
-4
examples/openapi-ts-fetch/src/client/client/client.gen.ts
···
31
31
32
32
const interceptors = createInterceptors<Request, Response, unknown, ResolvedRequestOptions>();
33
33
34
-
const beforeRequest = async (options: RequestOptions) => {
34
+
const beforeRequest = async <
35
+
TData = unknown,
36
+
TResponseStyle extends 'data' | 'fields' = 'fields',
37
+
ThrowOnError extends boolean = boolean,
38
+
Url extends string = string,
39
+
>(
40
+
options: RequestOptions<TData, TResponseStyle, ThrowOnError, Url>,
41
+
) => {
35
42
const opts = {
36
43
..._config,
37
44
...options,
···
60
67
opts.headers.delete('Content-Type');
61
68
}
62
69
63
-
const url = buildUrl(opts);
70
+
const resolvedOpts = opts as typeof opts &
71
+
ResolvedRequestOptions<TResponseStyle, ThrowOnError, Url>;
72
+
const url = buildUrl(resolvedOpts);
64
73
65
-
return { opts, url };
74
+
return { opts: resolvedOpts, url };
66
75
};
67
76
68
77
const request: Client['request'] = async (options) => {
69
-
// @ts-expect-error
70
78
const { opts, url } = await beforeRequest(options);
71
79
const requestInit: ReqInit = {
72
80
redirect: 'follow',
+12
-4
examples/openapi-ts-ky/src/client/client/client.gen.ts
+12
-4
examples/openapi-ts-ky/src/client/client/client.gen.ts
···
36
36
37
37
const interceptors = createInterceptors<Request, Response, unknown, ResolvedRequestOptions>();
38
38
39
-
const beforeRequest = async (options: RequestOptions) => {
39
+
const beforeRequest = async <
40
+
TData = unknown,
41
+
TResponseStyle extends 'data' | 'fields' = 'fields',
42
+
ThrowOnError extends boolean = boolean,
43
+
Url extends string = string,
44
+
>(
45
+
options: RequestOptions<TData, TResponseStyle, ThrowOnError, Url>,
46
+
) => {
40
47
const opts = {
41
48
..._config,
42
49
...options,
···
64
71
opts.headers.delete('Content-Type');
65
72
}
66
73
67
-
const url = buildUrl(opts);
74
+
const resolvedOpts = opts as typeof opts &
75
+
ResolvedRequestOptions<TResponseStyle, ThrowOnError, Url>;
76
+
const url = buildUrl(resolvedOpts);
68
77
69
-
return { opts, url };
78
+
return { opts: resolvedOpts, url };
70
79
};
71
80
72
81
const parseErrorResponse = async (
···
113
122
};
114
123
115
124
const request: Client['request'] = async (options) => {
116
-
// @ts-expect-error
117
125
const { opts, url } = await beforeRequest(options);
118
126
119
127
const kyInstance = opts.ky!;
+12
-4
examples/openapi-ts-nestjs/src/client/client/client.gen.ts
+12
-4
examples/openapi-ts-nestjs/src/client/client/client.gen.ts
···
31
31
32
32
const interceptors = createInterceptors<Request, Response, unknown, ResolvedRequestOptions>();
33
33
34
-
const beforeRequest = async (options: RequestOptions) => {
34
+
const beforeRequest = async <
35
+
TData = unknown,
36
+
TResponseStyle extends 'data' | 'fields' = 'fields',
37
+
ThrowOnError extends boolean = boolean,
38
+
Url extends string = string,
39
+
>(
40
+
options: RequestOptions<TData, TResponseStyle, ThrowOnError, Url>,
41
+
) => {
35
42
const opts = {
36
43
..._config,
37
44
...options,
···
60
67
opts.headers.delete('Content-Type');
61
68
}
62
69
63
-
const url = buildUrl(opts);
70
+
const resolvedOpts = opts as typeof opts &
71
+
ResolvedRequestOptions<TResponseStyle, ThrowOnError, Url>;
72
+
const url = buildUrl(resolvedOpts);
64
73
65
-
return { opts, url };
74
+
return { opts: resolvedOpts, url };
66
75
};
67
76
68
77
const request: Client['request'] = async (options) => {
69
-
// @ts-expect-error
70
78
const { opts, url } = await beforeRequest(options);
71
79
const requestInit: ReqInit = {
72
80
redirect: 'follow',
+10
-4
examples/openapi-ts-next/src/client/client/client.gen.ts
+10
-4
examples/openapi-ts-next/src/client/client/client.gen.ts
···
31
31
32
32
const interceptors = createInterceptors<Response, unknown, ResolvedRequestOptions>();
33
33
34
-
const beforeRequest = async (options: RequestOptions) => {
34
+
const beforeRequest = async <
35
+
TData = unknown,
36
+
ThrowOnError extends boolean = boolean,
37
+
Url extends string = string,
38
+
>(
39
+
options: RequestOptions<TData, ThrowOnError, Url>,
40
+
) => {
35
41
const opts = {
36
42
..._config,
37
43
...options,
···
60
66
opts.headers.delete('Content-Type');
61
67
}
62
68
63
-
const url = buildUrl(opts);
69
+
const resolvedOpts = opts as typeof opts & ResolvedRequestOptions<ThrowOnError, Url>;
70
+
const url = buildUrl(resolvedOpts);
64
71
65
-
return { opts, url };
72
+
return { opts: resolvedOpts, url };
66
73
};
67
74
68
75
// @ts-expect-error
69
76
const request: Client['request'] = async (options) => {
70
-
// @ts-expect-error
71
77
const { opts, url } = await beforeRequest(options);
72
78
73
79
for (const fn of interceptors.request.fns) {
+12
-4
examples/openapi-ts-openai/src/client/client/client.gen.ts
+12
-4
examples/openapi-ts-openai/src/client/client/client.gen.ts
···
31
31
32
32
const interceptors = createInterceptors<Request, Response, unknown, ResolvedRequestOptions>();
33
33
34
-
const beforeRequest = async (options: RequestOptions) => {
34
+
const beforeRequest = async <
35
+
TData = unknown,
36
+
TResponseStyle extends 'data' | 'fields' = 'fields',
37
+
ThrowOnError extends boolean = boolean,
38
+
Url extends string = string,
39
+
>(
40
+
options: RequestOptions<TData, TResponseStyle, ThrowOnError, Url>,
41
+
) => {
35
42
const opts = {
36
43
..._config,
37
44
...options,
···
60
67
opts.headers.delete('Content-Type');
61
68
}
62
69
63
-
const url = buildUrl(opts);
70
+
const resolvedOpts = opts as typeof opts &
71
+
ResolvedRequestOptions<TResponseStyle, ThrowOnError, Url>;
72
+
const url = buildUrl(resolvedOpts);
64
73
65
-
return { opts, url };
74
+
return { opts: resolvedOpts, url };
66
75
};
67
76
68
77
const request: Client['request'] = async (options) => {
69
-
// @ts-expect-error
70
78
const { opts, url } = await beforeRequest(options);
71
79
const requestInit: ReqInit = {
72
80
redirect: 'follow',
+12
-4
examples/openapi-ts-pinia-colada/src/client/client/client.gen.ts
+12
-4
examples/openapi-ts-pinia-colada/src/client/client/client.gen.ts
···
31
31
32
32
const interceptors = createInterceptors<Request, Response, unknown, ResolvedRequestOptions>();
33
33
34
-
const beforeRequest = async (options: RequestOptions) => {
34
+
const beforeRequest = async <
35
+
TData = unknown,
36
+
TResponseStyle extends 'data' | 'fields' = 'fields',
37
+
ThrowOnError extends boolean = boolean,
38
+
Url extends string = string,
39
+
>(
40
+
options: RequestOptions<TData, TResponseStyle, ThrowOnError, Url>,
41
+
) => {
35
42
const opts = {
36
43
..._config,
37
44
...options,
···
60
67
opts.headers.delete('Content-Type');
61
68
}
62
69
63
-
const url = buildUrl(opts);
70
+
const resolvedOpts = opts as typeof opts &
71
+
ResolvedRequestOptions<TResponseStyle, ThrowOnError, Url>;
72
+
const url = buildUrl(resolvedOpts);
64
73
65
-
return { opts, url };
74
+
return { opts: resolvedOpts, url };
66
75
};
67
76
68
77
const request: Client['request'] = async (options) => {
69
-
// @ts-expect-error
70
78
const { opts, url } = await beforeRequest(options);
71
79
const requestInit: ReqInit = {
72
80
redirect: 'follow',
+8
-2
examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/client.gen.ts
+8
-2
examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/client.gen.ts
···
97
97
return { opts, req, url };
98
98
};
99
99
100
-
const beforeRequest = async (options: RequestOptions) => {
100
+
const beforeRequest = async <
101
+
TData = unknown,
102
+
TResponseStyle extends ResponseStyle = 'fields',
103
+
ThrowOnError extends boolean = boolean,
104
+
Url extends string = string,
105
+
>(
106
+
options: RequestOptions<TData, TResponseStyle, ThrowOnError, Url>,
107
+
) => {
101
108
const { opts, req, url } = requestOptions(options);
102
109
103
110
if (opts.security) {
···
115
122
};
116
123
117
124
const request: Client['request'] = async (options) => {
118
-
// @ts-expect-error
119
125
const { opts, req: initialReq } = await beforeRequest(options);
120
126
121
127
let req = initialReq;
+12
-4
examples/openapi-ts-tanstack-react-query/src/client/client/client.gen.ts
+12
-4
examples/openapi-ts-tanstack-react-query/src/client/client/client.gen.ts
···
31
31
32
32
const interceptors = createInterceptors<Request, Response, unknown, ResolvedRequestOptions>();
33
33
34
-
const beforeRequest = async (options: RequestOptions) => {
34
+
const beforeRequest = async <
35
+
TData = unknown,
36
+
TResponseStyle extends 'data' | 'fields' = 'fields',
37
+
ThrowOnError extends boolean = boolean,
38
+
Url extends string = string,
39
+
>(
40
+
options: RequestOptions<TData, TResponseStyle, ThrowOnError, Url>,
41
+
) => {
35
42
const opts = {
36
43
..._config,
37
44
...options,
···
60
67
opts.headers.delete('Content-Type');
61
68
}
62
69
63
-
const url = buildUrl(opts);
70
+
const resolvedOpts = opts as typeof opts &
71
+
ResolvedRequestOptions<TResponseStyle, ThrowOnError, Url>;
72
+
const url = buildUrl(resolvedOpts);
64
73
65
-
return { opts, url };
74
+
return { opts: resolvedOpts, url };
66
75
};
67
76
68
77
const request: Client['request'] = async (options) => {
69
-
// @ts-expect-error
70
78
const { opts, url } = await beforeRequest(options);
71
79
const requestInit: ReqInit = {
72
80
redirect: 'follow',
+12
-4
examples/openapi-ts-tanstack-svelte-query/src/client/client/client.gen.ts
+12
-4
examples/openapi-ts-tanstack-svelte-query/src/client/client/client.gen.ts
···
31
31
32
32
const interceptors = createInterceptors<Request, Response, unknown, ResolvedRequestOptions>();
33
33
34
-
const beforeRequest = async (options: RequestOptions) => {
34
+
const beforeRequest = async <
35
+
TData = unknown,
36
+
TResponseStyle extends 'data' | 'fields' = 'fields',
37
+
ThrowOnError extends boolean = boolean,
38
+
Url extends string = string,
39
+
>(
40
+
options: RequestOptions<TData, TResponseStyle, ThrowOnError, Url>,
41
+
) => {
35
42
const opts = {
36
43
..._config,
37
44
...options,
···
60
67
opts.headers.delete('Content-Type');
61
68
}
62
69
63
-
const url = buildUrl(opts);
70
+
const resolvedOpts = opts as typeof opts &
71
+
ResolvedRequestOptions<TResponseStyle, ThrowOnError, Url>;
72
+
const url = buildUrl(resolvedOpts);
64
73
65
-
return { opts, url };
74
+
return { opts: resolvedOpts, url };
66
75
};
67
76
68
77
const request: Client['request'] = async (options) => {
69
-
// @ts-expect-error
70
78
const { opts, url } = await beforeRequest(options);
71
79
const requestInit: ReqInit = {
72
80
redirect: 'follow',
+12
-4
examples/openapi-ts-tanstack-vue-query/src/client/client/client.gen.ts
+12
-4
examples/openapi-ts-tanstack-vue-query/src/client/client/client.gen.ts
···
31
31
32
32
const interceptors = createInterceptors<Request, Response, unknown, ResolvedRequestOptions>();
33
33
34
-
const beforeRequest = async (options: RequestOptions) => {
34
+
const beforeRequest = async <
35
+
TData = unknown,
36
+
TResponseStyle extends 'data' | 'fields' = 'fields',
37
+
ThrowOnError extends boolean = boolean,
38
+
Url extends string = string,
39
+
>(
40
+
options: RequestOptions<TData, TResponseStyle, ThrowOnError, Url>,
41
+
) => {
35
42
const opts = {
36
43
..._config,
37
44
...options,
···
60
67
opts.headers.delete('Content-Type');
61
68
}
62
69
63
-
const url = buildUrl(opts);
70
+
const resolvedOpts = opts as typeof opts &
71
+
ResolvedRequestOptions<TResponseStyle, ThrowOnError, Url>;
72
+
const url = buildUrl(resolvedOpts);
64
73
65
-
return { opts, url };
74
+
return { opts: resolvedOpts, url };
66
75
};
67
76
68
77
const request: Client['request'] = async (options) => {
69
-
// @ts-expect-error
70
78
const { opts, url } = await beforeRequest(options);
71
79
const requestInit: ReqInit = {
72
80
redirect: 'follow',