fork of hey-api/openapi-ts because I need some additional things
Merge pull request #3601 from pgraug/fix/self-mapped-discriminator
Fix mapped discriminator to self outputting `$type: string` instead of string literal
+296
+6
.changeset/proud-cougars-report.md
+6
.changeset/proud-cougars-report.md
+7
packages/openapi-ts-tests/main/test/3.0.x.test.ts
+7
packages/openapi-ts-tests/main/test/3.0.x.test.ts
···
226
226
},
227
227
{
228
228
config: createConfig({
229
+
input: 'discriminator-object-self-mapped.json',
230
+
output: 'discriminator-object-self-mapped',
231
+
}),
232
+
description: 'handles object discriminator mappings that include the schema itself',
233
+
},
234
+
{
235
+
config: createConfig({
229
236
input: 'discriminator-non-string.yaml',
230
237
output: 'discriminator-non-string',
231
238
}),
+7
packages/openapi-ts-tests/main/test/3.1.x.test.ts
+7
packages/openapi-ts-tests/main/test/3.1.x.test.ts
···
252
252
},
253
253
{
254
254
config: createConfig({
255
+
input: 'discriminator-object-self-mapped.json',
256
+
output: 'discriminator-object-self-mapped',
257
+
}),
258
+
description: 'handles object discriminator mappings that include the schema itself',
259
+
},
260
+
{
261
+
config: createConfig({
255
262
input: 'discriminator-non-string.yaml',
256
263
output: 'discriminator-non-string',
257
264
}),
+3
packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/discriminator-object-self-mapped/index.ts
+3
packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/discriminator-object-self-mapped/index.ts
+32
packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/discriminator-object-self-mapped/types.gen.ts
+32
packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/discriminator-object-self-mapped/types.gen.ts
···
1
+
// This file is auto-generated by @hey-api/openapi-ts
2
+
3
+
export type ClientOptions = {
4
+
baseUrl: `${string}://${string}` | (string & {});
5
+
};
6
+
7
+
export type BlogPostDto = {
8
+
$type: 'BlogPost';
9
+
id: number;
10
+
title: string;
11
+
};
12
+
13
+
export type BlogPostWithImageDto = Omit<BlogPostDto, '$type'> & {
14
+
imageUrl: string;
15
+
$type: 'BlogPostWithImage';
16
+
};
17
+
18
+
export type GetBlogPostsData = {
19
+
body?: never;
20
+
path?: never;
21
+
query?: never;
22
+
url: '/blog-posts';
23
+
};
24
+
25
+
export type GetBlogPostsResponses = {
26
+
/**
27
+
* List of blog posts
28
+
*/
29
+
200: Array<BlogPostDto | BlogPostWithImageDto>;
30
+
};
31
+
32
+
export type GetBlogPostsResponse = GetBlogPostsResponses[keyof GetBlogPostsResponses];
+3
packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/discriminator-object-self-mapped/index.ts
+3
packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/discriminator-object-self-mapped/index.ts
+32
packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/discriminator-object-self-mapped/types.gen.ts
+32
packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/discriminator-object-self-mapped/types.gen.ts
···
1
+
// This file is auto-generated by @hey-api/openapi-ts
2
+
3
+
export type ClientOptions = {
4
+
baseUrl: `${string}://${string}` | (string & {});
5
+
};
6
+
7
+
export type BlogPostDto = {
8
+
$type: 'BlogPost';
9
+
id: number;
10
+
title: string;
11
+
};
12
+
13
+
export type BlogPostWithImageDto = Omit<BlogPostDto, '$type'> & {
14
+
imageUrl: string;
15
+
$type: 'BlogPostWithImage';
16
+
};
17
+
18
+
export type GetBlogPostsData = {
19
+
body?: never;
20
+
path?: never;
21
+
query?: never;
22
+
url: '/blog-posts';
23
+
};
24
+
25
+
export type GetBlogPostsResponses = {
26
+
/**
27
+
* List of blog posts
28
+
*/
29
+
200: Array<BlogPostDto | BlogPostWithImageDto>;
30
+
};
31
+
32
+
export type GetBlogPostsResponse = GetBlogPostsResponses[keyof GetBlogPostsResponses];
+73
specs/3.0.x/discriminator-object-self-mapped.json
+73
specs/3.0.x/discriminator-object-self-mapped.json
···
1
+
{
2
+
"openapi": "3.0.3",
3
+
"info": {
4
+
"title": "Discriminator object schema with self mapping",
5
+
"version": "1.0.0",
6
+
"description": "Ensures a concrete schema with a discriminator mapping to itself gets a literal discriminator value instead of falling back to string."
7
+
},
8
+
"paths": {
9
+
"/blog-posts": {
10
+
"get": {
11
+
"summary": "Get blog posts",
12
+
"responses": {
13
+
"200": {
14
+
"description": "List of blog posts",
15
+
"content": {
16
+
"application/json": {
17
+
"schema": {
18
+
"type": "array",
19
+
"items": {
20
+
"oneOf": [
21
+
{ "$ref": "#/components/schemas/BlogPostDto" },
22
+
{ "$ref": "#/components/schemas/BlogPostWithImageDto" }
23
+
]
24
+
}
25
+
}
26
+
}
27
+
}
28
+
}
29
+
}
30
+
}
31
+
}
32
+
},
33
+
"components": {
34
+
"schemas": {
35
+
"BlogPostDto": {
36
+
"type": "object",
37
+
"required": ["$type", "id", "title"],
38
+
"properties": {
39
+
"$type": {
40
+
"type": "string"
41
+
},
42
+
"id": {
43
+
"type": "integer"
44
+
},
45
+
"title": {
46
+
"type": "string"
47
+
}
48
+
},
49
+
"discriminator": {
50
+
"propertyName": "$type",
51
+
"mapping": {
52
+
"BlogPost": "#/components/schemas/BlogPostDto",
53
+
"BlogPostWithImage": "#/components/schemas/BlogPostWithImageDto"
54
+
}
55
+
}
56
+
},
57
+
"BlogPostWithImageDto": {
58
+
"allOf": [
59
+
{ "$ref": "#/components/schemas/BlogPostDto" },
60
+
{
61
+
"type": "object",
62
+
"required": ["imageUrl"],
63
+
"properties": {
64
+
"imageUrl": {
65
+
"type": "string"
66
+
}
67
+
}
68
+
}
69
+
]
70
+
}
71
+
}
72
+
}
73
+
}
+73
specs/3.1.x/discriminator-object-self-mapped.json
+73
specs/3.1.x/discriminator-object-self-mapped.json
···
1
+
{
2
+
"openapi": "3.1.0",
3
+
"info": {
4
+
"title": "Discriminator object schema with self mapping",
5
+
"version": "1.0.0",
6
+
"description": "Ensures a concrete schema with a discriminator mapping to itself gets a literal discriminator value instead of falling back to string."
7
+
},
8
+
"paths": {
9
+
"/blog-posts": {
10
+
"get": {
11
+
"summary": "Get blog posts",
12
+
"responses": {
13
+
"200": {
14
+
"description": "List of blog posts",
15
+
"content": {
16
+
"application/json": {
17
+
"schema": {
18
+
"type": "array",
19
+
"items": {
20
+
"oneOf": [
21
+
{ "$ref": "#/components/schemas/BlogPostDto" },
22
+
{ "$ref": "#/components/schemas/BlogPostWithImageDto" }
23
+
]
24
+
}
25
+
}
26
+
}
27
+
}
28
+
}
29
+
}
30
+
}
31
+
}
32
+
},
33
+
"components": {
34
+
"schemas": {
35
+
"BlogPostDto": {
36
+
"type": "object",
37
+
"required": ["$type", "id", "title"],
38
+
"properties": {
39
+
"$type": {
40
+
"type": "string"
41
+
},
42
+
"id": {
43
+
"type": "integer"
44
+
},
45
+
"title": {
46
+
"type": "string"
47
+
}
48
+
},
49
+
"discriminator": {
50
+
"propertyName": "$type",
51
+
"mapping": {
52
+
"BlogPost": "#/components/schemas/BlogPostDto",
53
+
"BlogPostWithImage": "#/components/schemas/BlogPostWithImageDto"
54
+
}
55
+
}
56
+
},
57
+
"BlogPostWithImageDto": {
58
+
"allOf": [
59
+
{ "$ref": "#/components/schemas/BlogPostDto" },
60
+
{
61
+
"type": "object",
62
+
"required": ["imageUrl"],
63
+
"properties": {
64
+
"imageUrl": {
65
+
"type": "string"
66
+
}
67
+
}
68
+
}
69
+
]
70
+
}
71
+
}
72
+
}
73
+
}