Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 46 additions & 0 deletions demo/examples/tests/discriminator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,35 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/BaseRequiredMapping"

/discriminator-empty-subschema:
get:
tags:
- discriminator
summary: Discriminator with Subschema Inheriting All Fields (No Extra Fields)
description: |
This schema reproduces a sub-schema that inherits all fields from the parent (via allOf) and does not define any new properties.
Schema:
```yaml
type: object
discriminator:
propertyName: type
mapping:
EmptyType: '#/components/schemas/EmptyType'
properties:
type:
type: string
oneOf:
- $ref: '#/components/schemas/EmptyType'
```
responses:
"200":
description: Successful response
content:
application/json:
schema:
$ref: "#/components/schemas/BaseEmptySubschema"

components:
schemas:
BaseBasic:
Expand Down Expand Up @@ -470,6 +499,18 @@ components:
- $ref: "#/components/schemas/TypeA"
- $ref: "#/components/schemas/TypeB"

BaseEmptySubschema:
type: object
discriminator:
propertyName: type
mapping:
EmptyType: "#/components/schemas/EmptyType"
properties:
type:
type: string
oneOf:
- $ref: "#/components/schemas/EmptyType"

TypeA:
type: object
properties:
Expand Down Expand Up @@ -523,3 +564,8 @@ components:
type: boolean
required:
- type

EmptyType:
type: object
allOf:
- $ref: "#/components/schemas/BaseEmptySubschema"
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,8 @@ const DiscriminatorNode: React.FC<DiscriminatorNodeProps> = ({
}

const subProperties = subSchema.properties || mergedSubSchema.properties;
if (subProperties[discriminator.propertyName]) {
// Add a safeguard check to avoid referencing subProperties if it's undefined
if (subProperties && subProperties[discriminator.propertyName]) {
if (schema.properties) {
schema.properties![discriminator.propertyName] = {
...schema.properties![discriminator.propertyName],
Expand Down