fork of hey-api/openapi-ts because I need some additional things
fix: explicit discriminator mapping wins over fallback in nested allOf
When a schema extends a parent whose allOf contains both a $ref schema
(with a discriminator that doesn't list the child) and an inline schema
(with a discriminator that does explicitly map the child), the generated
type was getting the wrong $type literal — the schema name fallback from
the $ref discriminator — instead of the value from the explicit inline
mapping.
The root cause is that findDiscriminatorsInSchema traverses allOf entries
in order, so the $ref schema's discriminator is seen first. Since the
child isn't in that mapping, discriminatorValues falls back to the schema
name, marks the property name as seen, and the correct inline discriminator
is then skipped as a duplicate.
Fix: track whether each collected discriminator value came from an explicit
mapping match or a schema-name fallback. If a later discriminator for the
same property has an explicit match while the existing one is only a
fallback, replace it. Fallback-only cases (schema genuinely not in any
mapping) are unaffected.
Applied to both the 3.0.x and 3.1.x parsers, with a minimal reproduction
spec and snapshot test for each.
+367
-55
+8
packages/openapi-ts-tests/main/test/3.0.x.test.ts
+8
packages/openapi-ts-tests/main/test/3.0.x.test.ts
···
219
219
},
220
220
{
221
221
config: createConfig({
222
+
input: 'discriminator-allof-inline.json',
223
+
output: 'discriminator-allof-inline',
224
+
}),
225
+
description:
226
+
'handles allOf where inline schema discriminator mapping should take priority over $ref discriminator fallback',
227
+
},
228
+
{
229
+
config: createConfig({
222
230
input: 'discriminator-non-string.yaml',
223
231
output: 'discriminator-non-string',
224
232
}),
+8
packages/openapi-ts-tests/main/test/3.1.x.test.ts
+8
packages/openapi-ts-tests/main/test/3.1.x.test.ts
···
245
245
},
246
246
{
247
247
config: createConfig({
248
+
input: 'discriminator-allof-inline.json',
249
+
output: 'discriminator-allof-inline',
250
+
}),
251
+
description:
252
+
'handles allOf where inline schema discriminator mapping should take priority over $ref discriminator fallback',
253
+
},
254
+
{
255
+
config: createConfig({
248
256
input: 'discriminator-non-string.yaml',
249
257
output: 'discriminator-non-string',
250
258
}),
+3
packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/discriminator-allof-inline/index.ts
+3
packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/discriminator-allof-inline/index.ts
+41
packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/discriminator-allof-inline/types.gen.ts
+41
packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/discriminator-allof-inline/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 Foo = {
8
+
$type: string;
9
+
foo?: string;
10
+
};
11
+
12
+
export type Bar = Omit<Foo, '$type'> & {
13
+
$type: 'FooBar';
14
+
bar?: string;
15
+
};
16
+
17
+
export type Baz = Omit<Foo, '$type'> & {
18
+
baz?: string;
19
+
$type: 'FooBaz';
20
+
};
21
+
22
+
export type Qux = Omit<Bar, '$type'> & {
23
+
qux?: string;
24
+
$type: 'BarQux';
25
+
};
26
+
27
+
export type GetFoosData = {
28
+
body?: never;
29
+
path?: never;
30
+
query?: never;
31
+
url: '/foos';
32
+
};
33
+
34
+
export type GetFoosResponses = {
35
+
/**
36
+
* OK
37
+
*/
38
+
200: Bar | Baz | Qux;
39
+
};
40
+
41
+
export type GetFoosResponse = GetFoosResponses[keyof GetFoosResponses];
+3
packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/discriminator-allof-inline/index.ts
+3
packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/discriminator-allof-inline/index.ts
+41
packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/discriminator-allof-inline/types.gen.ts
+41
packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/discriminator-allof-inline/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 Foo = {
8
+
$type: string;
9
+
foo?: string;
10
+
};
11
+
12
+
export type Bar = Omit<Foo, '$type'> & {
13
+
$type: 'FooBar';
14
+
bar?: string;
15
+
};
16
+
17
+
export type Baz = Omit<Foo, '$type'> & {
18
+
baz?: string;
19
+
$type: 'FooBaz';
20
+
};
21
+
22
+
export type Qux = Omit<Bar, '$type'> & {
23
+
qux?: string;
24
+
$type: 'BarQux';
25
+
};
26
+
27
+
export type GetFoosData = {
28
+
body?: never;
29
+
path?: never;
30
+
query?: never;
31
+
url: '/foos';
32
+
};
33
+
34
+
export type GetFoosResponses = {
35
+
/**
36
+
* OK
37
+
*/
38
+
200: Bar | Baz | Qux;
39
+
};
40
+
41
+
export type GetFoosResponse = GetFoosResponses[keyof GetFoosResponses];
+90
specs/3.0.x/discriminator-allof-inline.json
+90
specs/3.0.x/discriminator-allof-inline.json
···
1
+
{
2
+
"openapi": "3.0.3",
3
+
"info": {
4
+
"title": "Discriminator allOf inline schema mapping",
5
+
"version": "1.0.0",
6
+
"description": "Reproduces a bug where a schema extending a parent whose allOf contains both a $ref (with a discriminator that doesn't map the child) and an inline schema (with a discriminator that does map the child) gets the wrong discriminator value. The inline discriminator mapping should win, not the $ref discriminator fallback."
7
+
},
8
+
"paths": {
9
+
"/foos": {
10
+
"get": {
11
+
"responses": {
12
+
"200": {
13
+
"description": "OK",
14
+
"content": {
15
+
"application/json": {
16
+
"schema": {
17
+
"oneOf": [
18
+
{ "$ref": "#/components/schemas/Bar" },
19
+
{ "$ref": "#/components/schemas/Baz" },
20
+
{ "$ref": "#/components/schemas/Qux" }
21
+
]
22
+
}
23
+
}
24
+
}
25
+
}
26
+
}
27
+
}
28
+
}
29
+
},
30
+
"components": {
31
+
"schemas": {
32
+
"Foo": {
33
+
"required": ["$type"],
34
+
"type": "object",
35
+
"properties": {
36
+
"$type": { "type": "string" },
37
+
"foo": { "type": "string" }
38
+
},
39
+
"discriminator": {
40
+
"propertyName": "$type",
41
+
"mapping": {
42
+
"FooBar": "#/components/schemas/Bar",
43
+
"FooBaz": "#/components/schemas/Baz"
44
+
}
45
+
}
46
+
},
47
+
"Bar": {
48
+
"allOf": [
49
+
{ "$ref": "#/components/schemas/Foo" },
50
+
{
51
+
"required": ["$type"],
52
+
"type": "object",
53
+
"properties": {
54
+
"$type": { "type": "string" },
55
+
"bar": { "type": "string" }
56
+
},
57
+
"discriminator": {
58
+
"propertyName": "$type",
59
+
"mapping": {
60
+
"BarQux": "#/components/schemas/Qux"
61
+
}
62
+
}
63
+
}
64
+
]
65
+
},
66
+
"Baz": {
67
+
"allOf": [
68
+
{ "$ref": "#/components/schemas/Foo" },
69
+
{
70
+
"type": "object",
71
+
"properties": {
72
+
"baz": { "type": "string" }
73
+
}
74
+
}
75
+
]
76
+
},
77
+
"Qux": {
78
+
"allOf": [
79
+
{ "$ref": "#/components/schemas/Bar" },
80
+
{
81
+
"type": "object",
82
+
"properties": {
83
+
"qux": { "type": "string" }
84
+
}
85
+
}
86
+
]
87
+
}
88
+
}
89
+
}
90
+
}
+90
specs/3.1.x/discriminator-allof-inline.json
+90
specs/3.1.x/discriminator-allof-inline.json
···
1
+
{
2
+
"openapi": "3.1.0",
3
+
"info": {
4
+
"title": "Discriminator allOf inline schema mapping",
5
+
"version": "1.0.0",
6
+
"description": "Reproduces a bug where a schema extending a parent whose allOf contains both a $ref (with a discriminator that doesn't map the child) and an inline schema (with a discriminator that does map the child) gets the wrong discriminator value. The inline discriminator mapping should win, not the $ref discriminator fallback."
7
+
},
8
+
"paths": {
9
+
"/foos": {
10
+
"get": {
11
+
"responses": {
12
+
"200": {
13
+
"description": "OK",
14
+
"content": {
15
+
"application/json": {
16
+
"schema": {
17
+
"oneOf": [
18
+
{ "$ref": "#/components/schemas/Bar" },
19
+
{ "$ref": "#/components/schemas/Baz" },
20
+
{ "$ref": "#/components/schemas/Qux" }
21
+
]
22
+
}
23
+
}
24
+
}
25
+
}
26
+
}
27
+
}
28
+
}
29
+
},
30
+
"components": {
31
+
"schemas": {
32
+
"Foo": {
33
+
"required": ["$type"],
34
+
"type": "object",
35
+
"properties": {
36
+
"$type": { "type": "string" },
37
+
"foo": { "type": "string" }
38
+
},
39
+
"discriminator": {
40
+
"propertyName": "$type",
41
+
"mapping": {
42
+
"FooBar": "#/components/schemas/Bar",
43
+
"FooBaz": "#/components/schemas/Baz"
44
+
}
45
+
}
46
+
},
47
+
"Bar": {
48
+
"allOf": [
49
+
{ "$ref": "#/components/schemas/Foo" },
50
+
{
51
+
"required": ["$type"],
52
+
"type": "object",
53
+
"properties": {
54
+
"$type": { "type": "string" },
55
+
"bar": { "type": "string" }
56
+
},
57
+
"discriminator": {
58
+
"propertyName": "$type",
59
+
"mapping": {
60
+
"BarQux": "#/components/schemas/Qux"
61
+
}
62
+
}
63
+
}
64
+
]
65
+
},
66
+
"Baz": {
67
+
"allOf": [
68
+
{ "$ref": "#/components/schemas/Foo" },
69
+
{
70
+
"type": "object",
71
+
"properties": {
72
+
"baz": { "type": "string" }
73
+
}
74
+
}
75
+
]
76
+
},
77
+
"Qux": {
78
+
"allOf": [
79
+
{ "$ref": "#/components/schemas/Bar" },
80
+
{
81
+
"type": "object",
82
+
"properties": {
83
+
"qux": { "type": "string" }
84
+
}
85
+
}
86
+
]
87
+
}
88
+
}
89
+
}
90
+
}