Skip to content

Commit 41bc967

Browse files
jamietannajamietanna
committed
WIP: show example of new multi-pass type name resolution 
1 parent 76c22fe commit 41bc967

8 files changed

Lines changed: 44 additions & 41 deletions

File tree

‎internal/test/components/components.gen.go‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/test/externalref/petstore/externalref.gen.go‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/test/issues/issue-1208-1209/issue-multi-json.gen.go‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/test/outputoptions/name-normalizer/to-camel-case-with-additional-initialisms/name_normalizer.gen.go‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/name_normalizer.gen.go‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/test/strict-server/client/client.gen.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/codegen/codegen.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ func Generate(spec *openapi3.T, opts Configuration) (string, error) {
184184

185185
// Multi-pass name resolution: gather all schemas, then resolve names globally.
186186
// Only enabled when resolve-type-name-collisions is set.
187-
if opts.OutputOptions.ResolveTypeNameCollisions {
187+
if true {
188188
gathered := GatherSchemas(spec, opts)
189189
globalState.resolvedNames = ResolveNames(gathered)
190190
// Build a separate operationID -> wrapper name lookup for genResponseTypeName.
@@ -737,7 +737,7 @@ func GenerateTypesForResponses(t *template.Template, responses openapi3.Response
737737
// TODO: revisit this at the next major version change —
738738
// always include the media type in the schema path.
739739
schemaPath := []string{responseName}
740-
if jsonCount > 1 && globalState.options.OutputOptions.ResolveTypeNameCollisions {
740+
if jsonCount > 1 && true {
741741
schemaPath = append(schemaPath, mediaTypeToCamelCase(mediaType))
742742
}
743743
goType, err := GenerateGoSchema(response.Schema, schemaPath)

‎pkg/codegen/operations.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ func (o *OperationDefinition) GetResponseTypeDefinitions() ([]ResponseTypeDefini
341341
// TODO: revisit this at the next major version change —
342342
// always include the media type in the schema path.
343343
schemaPath := []string{o.OperationId, responseName}
344-
if jsonCount > 1 && util.IsMediaTypeJson(contentTypeName) && globalState.options.OutputOptions.ResolveTypeNameCollisions {
344+
if jsonCount > 1 && util.IsMediaTypeJson(contentTypeName) && true {
345345
schemaPath = append(schemaPath, mediaTypeToCamelCase(contentTypeName))
346346
}
347347
responseSchema, err := GenerateGoSchema(contentType.Schema, schemaPath)

0 commit comments

Comments
 (0)