这是indexloc提供的服务，不要输入任何密码
Skip to content

Non ascii discriminator mapping fix #2471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 18, 2025
Merged

Non ascii discriminator mapping fix #2471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f99c7b8
Expansion of testcases to demonstrate problem.
josstn Aug 18, 2025
05ed45a
Use resolved ref value when resolving discriminator values.
josstn Aug 18, 2025
e6df695
Updated test snapshots after fix for discriminator mapping.
josstn Aug 18, 2025
82af768
Create two-toys-join.md
mrlubos Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/two-toys-join.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@hey-api/openapi-ts": patch
---

fix(parser): handle non-ascii characters in discriminator
6 changes: 5 additions & 1 deletion packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/discriminator-any-of/types.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export type Baz = Qux;

export type Bar = Qux;

export type Spæcial = Qux;

export type Qux = {
id: string;
type: Quux;
Expand All @@ -21,7 +23,9 @@ export type Quuz = ({
type?: 'bar';
} & Bar) | ({
type?: 'baz';
} & Baz);
} & Baz) | ({
type?: 'non-ascii';
} & Spæcial);

export type ClientOptions = {
baseUrl: `${string}://${string}` | (string & {});
Expand Down
8 changes: 7 additions & 1 deletion ...ges/openapi-ts-tests/main/test/__snapshots__/3.0.x/discriminator-mapped-many/types.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ export type Foo = ({
foo: 'one' | 'two';
} & Bar) | ({
foo: 'three';
} & Baz);
} & Baz) | ({
foo: 'four';
} & Spæcial);

export type Bar = {
foo?: 'one' | 'two';
Expand All @@ -14,6 +16,10 @@ export type Baz = {
foo?: 'three';
};

export type Spæcial = {
foo?: 'four';
};

export type ClientOptions = {
baseUrl: `${string}://${string}` | (string & {});
};
6 changes: 5 additions & 1 deletion packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/discriminator-one-of/types.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export type Baz = Qux;

export type Bar = Qux;

export type Spæcial = Qux;

export type Qux = {
id: string;
type: Quux;
Expand All @@ -21,7 +23,9 @@ export type Quuz = ({
type: 'bar';
} & Bar) | ({
type: 'baz';
} & Baz);
} & Baz) | ({
type: 'non-ascii';
} & Spæcial);

export type ClientOptions = {
baseUrl: `${string}://${string}` | (string & {});
Expand Down
6 changes: 5 additions & 1 deletion packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/discriminator-any-of/types.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export type Baz = Qux;

export type Bar = Qux;

export type Spæcial = Qux;

export type Qux = {
id: string;
type: Quux;
Expand All @@ -21,7 +23,9 @@ export type Quuz = ({
type?: 'bar';
} & Bar) | ({
type?: 'baz';
} & Baz);
} & Baz) | ({
type?: 'non-ascii';
} & Spæcial);

export type ClientOptions = {
baseUrl: `${string}://${string}` | (string & {});
Expand Down
8 changes: 7 additions & 1 deletion ...ges/openapi-ts-tests/main/test/__snapshots__/3.1.x/discriminator-mapped-many/types.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ export type Foo = ({
foo: 'one' | 'two';
} & Bar) | ({
foo: 'three';
} & Baz);
} & Baz) | ({
foo: 'four';
} & Spæcial);

export type Bar = {
foo?: 'one' | 'two';
Expand All @@ -14,6 +16,10 @@ export type Baz = {
foo?: 'three';
};

export type Spæcial = {
foo?: 'four';
};

export type ClientOptions = {
baseUrl: `${string}://${string}` | (string & {});
};
6 changes: 5 additions & 1 deletion packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/discriminator-one-of/types.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export type Baz = Qux;

export type Bar = Qux;

export type Spæcial = Qux;

export type Qux = {
id: string;
type: Quux;
Expand All @@ -21,7 +23,9 @@ export type Quuz = ({
type: 'bar';
} & Bar) | ({
type: 'baz';
} & Baz);
} & Baz) | ({
type: 'non-ascii';
} & Spæcial);

export type ClientOptions = {
baseUrl: `${string}://${string}` | (string & {});
Expand Down
5 changes: 5 additions & 0 deletions packages/openapi-ts-tests/specs/3.0.x/discriminator-any-of.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ components:
Bar:
allOf:
- $ref: '#/components/schemas/Qux'
Spæcial:
allOf:
- $ref: '#/components/schemas/Qux'
Qux:
type: object
properties:
Expand All @@ -35,8 +38,10 @@ components:
anyOf:
- $ref: '#/components/schemas/Bar'
- $ref: '#/components/schemas/Baz'
- $ref: '#/components/schemas/Spæcial'
discriminator:
propertyName: type
mapping:
bar: '#/components/schemas/Bar'
baz: '#/components/schemas/Baz'
'non-ascii': '#/components/schemas/Spæcial'
9 changes: 9 additions & 0 deletions packages/openapi-ts-tests/specs/3.0.x/discriminator-mapped-many.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ components:
oneOf:
- $ref: '#/components/schemas/Bar'
- $ref: '#/components/schemas/Baz'
- $ref: '#/components/schemas/Spæcial'
discriminator:
propertyName: foo
mapping:
one: '#/components/schemas/Bar'
two: '#/components/schemas/Bar'
three: '#/components/schemas/Baz'
four: '#/components/schemas/Spæcial'
Bar:
type: object
properties:
Expand All @@ -29,3 +31,10 @@ components:
type: string
enum:
- three
Spæcial:
type: object
properties:
foo:
type: string
enum:
- four
5 changes: 5 additions & 0 deletions packages/openapi-ts-tests/specs/3.0.x/discriminator-one-of.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ components:
Bar:
allOf:
- $ref: '#/components/schemas/Qux'
Spæcial:
allOf:
- $ref: '#/components/schemas/Qux'
Qux:
type: object
properties:
Expand All @@ -35,8 +38,10 @@ components:
oneOf:
- $ref: '#/components/schemas/Bar'
- $ref: '#/components/schemas/Baz'
- $ref: '#/components/schemas/Spæcial'
discriminator:
propertyName: type
mapping:
bar: '#/components/schemas/Bar'
baz: '#/components/schemas/Baz'
'non-ascii': '#/components/schemas/Spæcial'
5 changes: 5 additions & 0 deletions packages/openapi-ts-tests/specs/3.1.x/discriminator-any-of.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ components:
Bar:
allOf:
- $ref: '#/components/schemas/Qux'
Spæcial:
allOf:
- $ref: '#/components/schemas/Qux'
Qux:
type: object
properties:
Expand All @@ -35,8 +38,10 @@ components:
anyOf:
- $ref: '#/components/schemas/Bar'
- $ref: '#/components/schemas/Baz'
- $ref: '#/components/schemas/Spæcial'
discriminator:
propertyName: type
mapping:
bar: '#/components/schemas/Bar'
baz: '#/components/schemas/Baz'
'non-ascii': '#/components/schemas/Spæcial'
9 changes: 9 additions & 0 deletions packages/openapi-ts-tests/specs/3.1.x/discriminator-mapped-many.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ components:
oneOf:
- $ref: '#/components/schemas/Bar'
- $ref: '#/components/schemas/Baz'
- $ref: '#/components/schemas/Spæcial'
discriminator:
propertyName: foo
mapping:
one: '#/components/schemas/Bar'
two: '#/components/schemas/Bar'
three: '#/components/schemas/Baz'
four: '#/components/schemas/Spæcial'
Bar:
type: object
properties:
Expand All @@ -29,3 +31,10 @@ components:
type: string
enum:
- three
Spæcial:
type: object
properties:
foo:
type: string
enum:
- four
5 changes: 5 additions & 0 deletions packages/openapi-ts-tests/specs/3.1.x/discriminator-one-of.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ components:
Bar:
allOf:
- $ref: '#/components/schemas/Qux'
Spæcial:
allOf:
- $ref: '#/components/schemas/Qux'
Qux:
type: object
properties:
Expand All @@ -35,8 +38,10 @@ components:
oneOf:
- $ref: '#/components/schemas/Bar'
- $ref: '#/components/schemas/Baz'
- $ref: '#/components/schemas/Spæcial'
discriminator:
propertyName: type
mapping:
bar: '#/components/schemas/Bar'
baz: '#/components/schemas/Baz'
'non-ascii': '#/components/schemas/Spæcial'
8 changes: 4 additions & 4 deletions packages/openapi-ts/src/openApi/3.0.x/parser/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,9 +538,9 @@ const parseAnyOf = ({
);

// `$ref` should be defined with discriminators
if (schema.discriminator && '$ref' in compositionSchema) {
if (schema.discriminator && irCompositionSchema.$ref != null) {
const values = discriminatorValues(
compositionSchema.$ref,
irCompositionSchema.$ref,
schema.discriminator.mapping,
);
const valueSchemas: ReadonlyArray<IR.SchemaObject> = values.map(
Expand Down Expand Up @@ -719,9 +719,9 @@ const parseOneOf = ({
);

// `$ref` should be defined with discriminators
if (schema.discriminator && '$ref' in compositionSchema) {
if (schema.discriminator && irCompositionSchema.$ref != null) {
const values = discriminatorValues(
compositionSchema.$ref,
irCompositionSchema.$ref,
schema.discriminator.mapping,
);
const valueSchemas: ReadonlyArray<IR.SchemaObject> = values.map(
Expand Down
8 changes: 4 additions & 4 deletions packages/openapi-ts/src/openApi/3.1.x/parser/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,9 +541,9 @@ const parseAnyOf = ({
});

// `$ref` should be defined with discriminators
if (schema.discriminator && compositionSchema.$ref) {
if (schema.discriminator && irCompositionSchema.$ref != null) {
const values = discriminatorValues(
compositionSchema.$ref,
irCompositionSchema.$ref,
schema.discriminator.mapping,
);
const valueSchemas: ReadonlyArray<IR.SchemaObject> = values.map(
Expand Down Expand Up @@ -697,9 +697,9 @@ const parseOneOf = ({
});

// `$ref` should be defined with discriminators
if (schema.discriminator && compositionSchema.$ref) {
if (schema.discriminator && irCompositionSchema.$ref != null) {
const values = discriminatorValues(
compositionSchema.$ref,
irCompositionSchema.$ref,
schema.discriminator.mapping,
);
const valueSchemas: ReadonlyArray<IR.SchemaObject> = values.map(
Expand Down
Loading