Skip to content

Fix problem with code redeclarations #436

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
deepmap-marcinr merged 1 commit into from
Oct 4, 2021
Merged

Fix problem with code redeclarations #436

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 35 additions & 6 deletions pkg/codegen/codegen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,9 +337,7 @@ func GenerateConstants(t *template.Template, ops []OperationDefinition) (string,

sort.Strings(providerNames)

for _, providerName := range providerNames {
constants.SecuritySchemeProviderNames = append(constants.SecuritySchemeProviderNames, providerName)
}
constants.SecuritySchemeProviderNames = append(constants.SecuritySchemeProviderNames, providerNames...)

return GenerateTemplates([]string{"constants.tmpl"}, t, constants)
}
Expand Down Expand Up @@ -487,10 +485,23 @@ func GenerateTypesForRequestBodies(t *template.Template, bodies map[string]*open
// Helper function to pass a bunch of types to the template engine, and buffer
// its output into a string.
func GenerateTypes(t *template.Template, types []TypeDefinition) (string, error) {
m := map[string]bool{}
ts := []TypeDefinition{}

for _, t := range types {
if found := m[t.TypeName]; found {
continue
}

m[t.TypeName] = true

ts = append(ts, t)
}

context := struct {
Types []TypeDefinition
}{
Types: types,
Types: ts,
}

return GenerateTemplates([]string{"typedef.tmpl"}, t, context)
Expand All @@ -500,7 +511,16 @@ func GenerateEnums(t *template.Template, types []TypeDefinition) (string, error)
c := Constants{
EnumDefinitions: []EnumDefinition{},
}

m := map[string]bool{}

for _, tp := range types {
if found := m[tp.TypeName]; found {
continue
}

m[tp.TypeName] = true

if len(tp.Schema.EnumValues) > 0 {
wrapper := ""
if tp.Schema.GoType == "string" {
Expand All @@ -514,7 +534,7 @@ func GenerateEnums(t *template.Template, types []TypeDefinition) (string, error)
}
}

return GenerateTemplates([]string{"constants.tmpl"}, t, c)
return GenerateTemplates([]string{"constants.tmpl"}, t, c)

}

Expand Down Expand Up @@ -545,14 +565,23 @@ func GenerateImports(t *template.Template, externalImports []string, packageName
Version: moduleVersion,
}

return GenerateTemplates([]string{"imports.tmpl"}, t, context)
return GenerateTemplates([]string{"imports.tmpl"}, t, context)
}

// Generate all the glue code which provides the API for interacting with
// additional properties and JSON-ification
func GenerateAdditionalPropertyBoilerplate(t *template.Template, typeDefs []TypeDefinition) (string, error) {
var filteredTypes []TypeDefinition

m := map[string]bool{}

for _, t := range typeDefs {
if found := m[t.TypeName]; found {
continue
}

m[t.TypeName] = true

if t.Schema.HasAdditionalProperties {
filteredTypes = append(filteredTypes, t)
}
Expand Down