fork of hey-api/openapi-ts because I need some additional things
Merge pull request #708 from hey-api/fix/types-additional-headers
fix: make getHeaders() accept generic
+31
-23
+5
.changeset/brave-eyes-suffer.md
+5
.changeset/brave-eyes-suffer.md
+6
-3
packages/client-axios/src/index.ts
+6
-3
packages/client-axios/src/index.ts
···
60
60
interceptors: { request: new Interceptors(), response: new Interceptors() },
61
61
};
62
62
63
-
export const getHeaders = async (
63
+
export const getHeaders = async <T>(
64
64
config: OpenAPIConfig,
65
-
options: ApiRequestOptions,
65
+
options: ApiRequestOptions<T>,
66
66
): Promise<Record<string, string>> => {
67
67
const [token, username, password, additionalHeaders] = await Promise.all([
68
+
// @ts-ignore
68
69
resolve(options, config.TOKEN),
70
+
// @ts-ignore
69
71
resolve(options, config.USERNAME),
72
+
// @ts-ignore
70
73
resolve(options, config.PASSWORD),
74
+
// @ts-ignore
71
75
resolve(options, config.HEADERS),
72
76
]);
73
77
74
78
const headers = Object.entries({
75
79
Accept: 'application/json',
76
-
// @ts-ignore
77
80
...additionalHeaders,
78
81
...options.headers,
79
82
})
+1
-1
packages/openapi-ts/src/templates/core/angular/getHeaders.hbs
+1
-1
packages/openapi-ts/src/templates/core/angular/getHeaders.hbs
···
1
-
export const getHeaders = (config: OpenAPIConfig, options: ApiRequestOptions): Observable<HttpHeaders> => {
1
+
export const getHeaders = <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Observable<HttpHeaders> => {
2
2
return forkJoin({
3
3
// @ts-ignore
4
4
token: resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/src/templates/core/axios/getHeaders.hbs
+1
-1
packages/openapi-ts/src/templates/core/axios/getHeaders.hbs
···
1
-
export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Record<string, string>> => {
1
+
export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Record<string, string>> => {
2
2
const [token, username, password, additionalHeaders] = await Promise.all([
3
3
// @ts-ignore
4
4
resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/src/templates/core/fetch/getHeaders.hbs
+1
-1
packages/openapi-ts/src/templates/core/fetch/getHeaders.hbs
···
1
-
export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
1
+
export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Headers> => {
2
2
const [token, username, password, additionalHeaders] = await Promise.all([
3
3
// @ts-ignore
4
4
resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/src/templates/core/xhr/getHeaders.hbs
+1
-1
packages/openapi-ts/src/templates/core/xhr/getHeaders.hbs
···
1
-
export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
1
+
export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Headers> => {
2
2
const [token, username, password, additionalHeaders] = await Promise.all([
3
3
// @ts-ignore
4
4
resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v2/core/request.ts.snap
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v2/core/request.ts.snap
···
110
110
return resolver;
111
111
};
112
112
113
-
export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
113
+
export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Headers> => {
114
114
const [token, username, password, additionalHeaders] = await Promise.all([
115
115
// @ts-ignore
116
116
resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3/core/request.ts.snap
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3/core/request.ts.snap
···
110
110
return resolver;
111
111
};
112
112
113
-
export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
113
+
export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Headers> => {
114
114
const [token, username, password, additionalHeaders] = await Promise.all([
115
115
// @ts-ignore
116
116
resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_angular/core/request.ts.snap
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_angular/core/request.ts.snap
···
114
114
return resolver;
115
115
};
116
116
117
-
export const getHeaders = (config: OpenAPIConfig, options: ApiRequestOptions): Observable<HttpHeaders> => {
117
+
export const getHeaders = <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Observable<HttpHeaders> => {
118
118
return forkJoin({
119
119
// @ts-ignore
120
120
token: resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_angular_transform/core/request.ts.snap
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_angular_transform/core/request.ts.snap
···
114
114
return resolver;
115
115
};
116
116
117
-
export const getHeaders = (config: OpenAPIConfig, options: ApiRequestOptions): Observable<HttpHeaders> => {
117
+
export const getHeaders = <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Observable<HttpHeaders> => {
118
118
return forkJoin({
119
119
// @ts-ignore
120
120
token: resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_axios/core/request.ts.snap
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_axios/core/request.ts.snap
···
117
117
return resolver;
118
118
};
119
119
120
-
export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Record<string, string>> => {
120
+
export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Record<string, string>> => {
121
121
const [token, username, password, additionalHeaders] = await Promise.all([
122
122
// @ts-ignore
123
123
resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_axios_transform/core/request.ts.snap
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_axios_transform/core/request.ts.snap
···
117
117
return resolver;
118
118
};
119
119
120
-
export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Record<string, string>> => {
120
+
export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Record<string, string>> => {
121
121
const [token, username, password, additionalHeaders] = await Promise.all([
122
122
// @ts-ignore
123
123
resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_client/core/request.ts.snap
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_client/core/request.ts.snap
···
110
110
return resolver;
111
111
};
112
112
113
-
export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
113
+
export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Headers> => {
114
114
const [token, username, password, additionalHeaders] = await Promise.all([
115
115
// @ts-ignore
116
116
resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_client_transform/core/request.ts.snap
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_client_transform/core/request.ts.snap
···
110
110
return resolver;
111
111
};
112
112
113
-
export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
113
+
export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Headers> => {
114
114
const [token, username, password, additionalHeaders] = await Promise.all([
115
115
// @ts-ignore
116
116
resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_enums_typescript/core/request.ts.snap
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_enums_typescript/core/request.ts.snap
···
110
110
return resolver;
111
111
};
112
112
113
-
export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
113
+
export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Headers> => {
114
114
const [token, username, password, additionalHeaders] = await Promise.all([
115
115
// @ts-ignore
116
116
resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_legacy_positional_args/core/request.ts.snap
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_legacy_positional_args/core/request.ts.snap
···
110
110
return resolver;
111
111
};
112
112
113
-
export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
113
+
export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Headers> => {
114
114
const [token, username, password, additionalHeaders] = await Promise.all([
115
115
// @ts-ignore
116
116
resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_node/core/request.ts.snap
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_node/core/request.ts.snap
···
113
113
return resolver;
114
114
};
115
115
116
-
export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
116
+
export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Headers> => {
117
117
const [token, username, password, additionalHeaders] = await Promise.all([
118
118
// @ts-ignore
119
119
resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_node_transform/core/request.ts.snap
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_node_transform/core/request.ts.snap
···
113
113
return resolver;
114
114
};
115
115
116
-
export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
116
+
export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Headers> => {
117
117
const [token, username, password, additionalHeaders] = await Promise.all([
118
118
// @ts-ignore
119
119
resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_options/core/request.ts.snap
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_options/core/request.ts.snap
···
110
110
return resolver;
111
111
};
112
112
113
-
export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
113
+
export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Headers> => {
114
114
const [token, username, password, additionalHeaders] = await Promise.all([
115
115
// @ts-ignore
116
116
resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_transform/core/request.ts.snap
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_transform/core/request.ts.snap
···
110
110
return resolver;
111
111
};
112
112
113
-
export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
113
+
export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Headers> => {
114
114
const [token, username, password, additionalHeaders] = await Promise.all([
115
115
// @ts-ignore
116
116
resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_xhr/core/request.ts.snap
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_xhr/core/request.ts.snap
···
114
114
return resolver;
115
115
};
116
116
117
-
export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
117
+
export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Headers> => {
118
118
const [token, username, password, additionalHeaders] = await Promise.all([
119
119
// @ts-ignore
120
120
resolve(options, config.TOKEN),
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_xhr_transform/core/request.ts.snap
+1
-1
packages/openapi-ts/test/__snapshots__/test/generated/v3_xhr_transform/core/request.ts.snap
···
114
114
return resolver;
115
115
};
116
116
117
-
export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
117
+
export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Headers> => {
118
118
const [token, username, password, additionalHeaders] = await Promise.all([
119
119
// @ts-ignore
120
120
resolve(options, config.TOKEN),