Skip to content

fix(cli): remove unused initialism-overrides option #2287

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
mromaszewicz merged 4 commits into from
Mar 23, 2026
Merged

fix(cli): remove unused initialism-overrides option #2287

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
212a0f3
fix(cli): remove unused `initialism-overrides` option
gaiaz-iusipov Mar 9, 2026
dcf3aa3
test: update `TestGenerateDefaultOperationID`
gaiaz-iusipov Mar 9, 2026
1748f55
Merge remote-tracking branch 'upstream/main' into pr/2287
mromaszewicz Mar 23, 2026
eeb16f8
Merge remote-tracking branch 'upstream/main' into pr/2287
mromaszewicz Mar 23, 2026
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
4 changes: 0 additions & 4 deletions cmd/oapi-codegen/oapi-codegen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ var (
flagExcludeSchemas string
flagResponseTypeSuffix string
flagAliasTypes bool
flagInitialismOverrides bool
)

type configuration struct {
Expand Down Expand Up @@ -112,7 +111,6 @@ func main() {
flag.StringVar(&flagExcludeSchemas, "exclude-schemas", "", "A comma separated list of schemas which must be excluded from generation.")
flag.StringVar(&flagResponseTypeSuffix, "response-type-suffix", "", "The suffix used for responses types.")
flag.BoolVar(&flagAliasTypes, "alias-types", false, "Alias type declarations if possible.")
flag.BoolVar(&flagInitialismOverrides, "initialism-overrides", false, "Use initialism overrides.")

flag.Parse()

Expand Down Expand Up @@ -459,8 +457,6 @@ func updateConfigFromFlags(cfg *configuration) error {
cfg.OutputFile = flagOutputFile
}

cfg.OutputOptions.InitialismOverrides = flagInitialismOverrides

return nil
}

Expand Down
4 changes: 0 additions & 4 deletions configuration-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,6 @@
"type": "string",
"description": "Override the default generated client type with the value"
},
"initialism-overrides": {
"type": "boolean",
"description": "Whether to use the initialism overrides"
},
"additional-initialisms": {
"type": "array",
"description": "AdditionalInitialisms defines additional initialisms to be used by the code generator. Has no effect unless the `name-normalizer` is set to `ToCamelCaseWithInitialisms`",
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/codegen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ func Generate(spec *openapi3.T, opts Configuration) (string, error) {
}
}

ops, err := OperationDefinitions(spec, opts.OutputOptions.InitialismOverrides)
ops, err := OperationDefinitions(spec)
if err != nil {
return "", fmt.Errorf("error creating operation definitions: %w", err)
}
Expand Down
2 changes: 0 additions & 2 deletions pkg/codegen/configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,6 @@ type OutputOptions struct {
ResponseTypeSuffix string `yaml:"response-type-suffix,omitempty"`
// Override the default generated client type with the value
ClientTypeName string `yaml:"client-type-name,omitempty"`
// Whether to use the initialism overrides
InitialismOverrides bool `yaml:"initialism-overrides,omitempty"`
// AdditionalInitialisms is a list of additional initialisms to use when generating names.
// NOTE that this has no effect unless the `name-normalizer` is set to `ToCamelCaseWithInitialisms`
AdditionalInitialisms []string `yaml:"additional-initialisms,omitempty"`
Expand Down
13 changes: 3 additions & 10 deletions pkg/codegen/operations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,16 +602,9 @@ func FilterParameterDefinitionByType(params []ParameterDefinition, in string) []
}

// OperationDefinitions returns all operations for a swagger definition.
func OperationDefinitions(swagger *openapi3.T, initialismOverrides bool) ([]OperationDefinition, error) {
func OperationDefinitions(swagger *openapi3.T) ([]OperationDefinition, error) {
var operations []OperationDefinition

var toCamelCaseFunc func(string) string
if initialismOverrides {
toCamelCaseFunc = ToCamelCaseWithInitialism
} else {
toCamelCaseFunc = ToCamelCase
}

if swagger == nil || swagger.Paths == nil {
return operations, nil
}
Expand Down Expand Up @@ -639,7 +632,7 @@ func OperationDefinitions(swagger *openapi3.T, initialismOverrides bool) ([]Oper
operationId := op.OperationID
// We rely on OperationID to generate function names, it's required
if operationId == "" {
operationId, err = generateDefaultOperationID(opName, requestPath, toCamelCaseFunc)
operationId, err = generateDefaultOperationID(opName, requestPath)
if err != nil {
return nil, fmt.Errorf("error generating default OperationID for %s/%s: %s",
opName, requestPath, err)
Expand Down Expand Up @@ -736,7 +729,7 @@ func OperationDefinitions(swagger *openapi3.T, initialismOverrides bool) ([]Oper
return operations, nil
}

func generateDefaultOperationID(opName string, requestPath string, toCamelCaseFunc func(string) string) (string, error) {
func generateDefaultOperationID(opName string, requestPath string) (string, error) {
var operationId = strings.ToLower(opName)

if opName == "" {
Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/operations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func TestGenerateDefaultOperationID(t *testing.T) {
}

for _, test := range suite {
got, err := generateDefaultOperationID(test.op, test.path, ToCamelCase)
got, err := generateDefaultOperationID(test.op, test.path)
if err != nil {
if !test.wantErr {
t.Fatalf("did not expected error but got %v", err)
Expand Down
Loading