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
26 changes: 26 additions & 0 deletions _testdata/positive/type_extension_name.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,24 @@ paths:
x-ogen-name: Decimal2
default: 1.23

/component:
get:
operationId: component
responses:
'200':
description: Test
content:
application/json:
schema:
type: object
required:
- amount
properties:
amount:
$ref: '#/components/schemas/usdAmount'
optionalAmount:
$ref: '#/components/schemas/usdAmount'

/required:
get:
operationId: required
Expand Down Expand Up @@ -73,3 +91,11 @@ paths:
type: number
x-ogen-type: github.com/ogen-go/ogen/_testdata/testtypes/bar/decimal.Decimal
x-ogen-name: Decimal2

components:
schemas:
# x-ogen-name must override the component key: type is USDAmount, not UsdAmount.
usdAmount:
type: string
x-ogen-type: github.com/ogen-go/ogen/_testdata/testtypes/foo/decimal.Decimal
x-ogen-name: USDAmount
15 changes: 9 additions & 6 deletions gen/schema_gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,15 @@ func (g *schemaGen) generate2(name string, schema *jsonschema.Schema) (ret *ir.T
}
}

// Resolve the final type name before any branch that may return early
// (e.g. external types via x-ogen-type), so x-ogen-name is always honored.
// The DefaultSet and UniqueItems checks below do not depend on name.
if n := schema.XOgenName; n != "" {
name = n
} else if len(name) > 0 && name[0] >= '0' && name[0] <= '9' {
name = "R" + name
}

if schema.XOgenType != "" {
t, err := ir.External(schema)
if err != nil {
Expand Down Expand Up @@ -243,12 +252,6 @@ func (g *schemaGen) generate2(name string, schema *jsonschema.Schema) (ret *ir.T
}
}

if n := schema.XOgenName; n != "" {
name = n
} else if len(name) > 0 && name[0] >= '0' && name[0] <= '9' {
name = "R" + name
}

var (
oneOf *ir.Type
anyOf *ir.Type
Expand Down
82 changes: 82 additions & 0 deletions internal/integration/test_type_extension_name/oas_client_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

122 changes: 122 additions & 0 deletions internal/integration/test_type_extension_name/oas_handlers_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading