use default method for cli usage

ignite · Mar 8, 2025 · 95f7c0c · 95f7c0c
1 parent 7961bfe
commit 95f7c0c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/ignite/templates/field/fields.go b/ignite/templates/field/fields.go
@@ -2,7 +2,8 @@ package field
 
 import (
 	"fmt"
-
+	"strings"
+
 	"github.com/ignite/cli/v29/ignite/pkg/multiformatname"
 	"github.com/ignite/cli/v29/ignite/templates/field/datatype"
 )
@@ -42,13 +43,13 @@ func (f Fields) ProtoImports() []string {
 	return allImports
 }
 
-// String returns all inline fields args for command usage.
-func (f Fields) String() string {
+// CLIUsage returns all inline fields args for CLI command usage.
+func (f Fields) CLIUsage() string {
 	args := ""
 	for _, field := range f {
-		args += fmt.Sprintf(" [%s]", field.Name.Kebab)
+		args += fmt.Sprintf(" [%s]", field.CLIUsage())
 	}
-	return args
+	return strings.TrimSpace(args)
 }
 
 // Custom return a list of custom fields.

diff --git a/ignite/templates/message/message.go b/ignite/templates/message/message.go
@@ -231,7 +231,7 @@ func clientCliTxModify(replacer placeholder.Replacer, opts *Options) genny.RunFn
 			template,
 			typed.PlaceholderAutoCLITx,
 			opts.MsgName.UpperCamel,
-			strings.TrimSpace(fmt.Sprintf("%s%s", opts.MsgName.Kebab, opts.Fields.String())),
+			fmt.Sprintf("%s %s", opts.MsgName.Kebab, opts.Fields.CLIUsage()),
 			opts.MsgName.Original,
 			strings.TrimSpace(positionalArgs),
 		)

diff --git a/ignite/templates/query/query.go b/ignite/templates/query/query.go
@@ -176,7 +176,7 @@ func cliQueryModify(replacer placeholder.Replacer, opts *Options) genny.RunFn {
 			template,
 			PlaceholderAutoCLIQuery,
 			opts.QueryName.UpperCamel,
-			strings.TrimSpace(fmt.Sprintf("%s%s", opts.QueryName.Kebab, opts.ReqFields.String())),
+			fmt.Sprintf("%s %s", opts.QueryName.Kebab, opts.ReqFields.CLIUsage()),
 			opts.Description,
 			strings.TrimSpace(positionalArgs),
 		)

diff --git a/ignite/templates/typed/list/list.go b/ignite/templates/typed/list/list.go
@@ -410,7 +410,7 @@ func clientCliTxModify(replacer placeholder.Replacer, opts *typed.Options) genny
 		var positionalArgs, positionalArgsStr string
 		for _, field := range opts.Fields {
 			positionalArgs += fmt.Sprintf(`{ProtoField: "%s"}, `, field.ProtoFieldName())
-			positionalArgsStr += fmt.Sprintf("[%s] ", field.Name.Kebab)
+			positionalArgsStr += fmt.Sprintf("[%s] ", field.CLIUsage())
 		}
 
 		template := `{

diff --git a/ignite/templates/typed/map/map.go b/ignite/templates/typed/map/map.go
@@ -673,7 +673,7 @@ func clientCliTxModify(replacer placeholder.Replacer, opts *typed.Options) genny
 		var positionalArgs, positionalArgsStr string
 		for _, field := range opts.Fields {
 			positionalArgs += fmt.Sprintf(`{ProtoField: "%s"}, `, field.ProtoFieldName())
-			positionalArgsStr += fmt.Sprintf("[%s] ", field.Name.Kebab)
+			positionalArgsStr += fmt.Sprintf("[%s] ", field.CLIUsage())
 		}
 
 		positionalArgs = index + positionalArgs

diff --git a/ignite/templates/typed/singleton/singleton.go b/ignite/templates/typed/singleton/singleton.go
@@ -534,7 +534,7 @@ func clientCliTxModify(replacer placeholder.Replacer, opts *typed.Options) genny
 		var positionalArgs, positionalArgsStr string
 		for _, field := range opts.Fields {
 			positionalArgs += fmt.Sprintf(`{ProtoField: "%s"}, `, field.ProtoFieldName())
-			positionalArgsStr += fmt.Sprintf("[%s] ", field.Name.Kebab)
+			positionalArgsStr += fmt.Sprintf("[%s] ", field.CLIUsage())
 		}
 
 		template := `{