Get rid of reset functions, not needed anymore

Author: maxlandon

gen/completions/command.go

@@ -5,24 +5,12 @@ import (
 	"reflect"
 
 	"github.com/reeflective/flags"
-	genflags "github.com/reeflective/flags/gen/flags"
 	"github.com/reeflective/flags/internal/scan"
 	"github.com/reeflective/flags/internal/tag"
 	comp "github.com/rsteube/carapace"
 	"github.com/spf13/cobra"
 )
 
-var onFinalize func()
-
-// WithReset has a similar role to flags.WithReset(), but for completions:
-// when invoked, this function will create a new instance of the command-tree
-// struct passed to Generate(), will rescan it and bind new completers with
-// their blank/default state.
-// In the carapace library, this function is called after each completer invocation.
-func WithReset() func() {
-	return onFinalize
-}
-
 // Gen uses a carapace completion builder to register various completions to its underlying
 // cobra command, parsing again the native struct for type and struct tags' information.
 // Arguments:
@@ -38,21 +26,6 @@ func Generate(cmd *cobra.Command, data interface{}, comps *comp.Carapace) (*comp
 		return completions, err
 	}
 
-	// And make a handler to be ran after each completion routine,
-	// so that commands/flags are reset to their blank/default state.
-	onFinalize = func() {
-		resetCommands := genflags.WithReset()
-		resetCommands()
-
-		// Instantiate a new command struct
-		val := reflect.ValueOf(data).Elem()
-		data = val.Addr().Interface()
-
-		if _, err := generate(cmd.Root(), data, comps); err != nil {
-			return
-		}
-	}
-
 	return completions, nil
 }
 

gen/flags/command.go

@@ -12,20 +12,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var onFinalize func()
-
-// WithReset registers a function to cobra finalizers: when invoked, this function
-// will create a new instance of the command-tree struct passed to Generate(), will
-// rescan it and bind new commands with their blank/default state.
-// This should normally only be used if you are using commands within a closed
-// loop Go program/shell, where commands will be invoked more than once.
-//
-// The associated function is returned, so that programs can reuse it at other times.
-func WithReset() func() {
-	cobra.OnFinalize(onFinalize)
-	return onFinalize
-}
-
 // Generate returns a root cobra Command to be used directly as an entry-point.
 // The data interface parameter can be nil, or arbitrarily:
 // - A simple group of options to bind at the local, root level
@@ -40,24 +26,6 @@ func Generate(data interface{}, opts ...flags.OptFunc) *cobra.Command {
 	// Scan the struct and bind all commands to this root.
 	generate(cmd, data, opts...)
 
-	// Make a handler to be used when this command
-	// tree is used in a closed-loop Go program/shell.
-	onFinalize = func() {
-		cmd.ResetCommands()
-
-		// Instantiate a new command struct
-		val := reflect.ValueOf(data)
-		if val.Kind() == reflect.Ptr {
-			val = reflect.Indirect(val)
-		}
-
-		data := reflect.New(val.Type()).Interface()
-
-		// And scan again to rebind all commands
-		// to their blank/default state.
-		generate(cmd, data, opts...)
-	}
-
 	return cmd
 }
 

tag.go

@@ -31,9 +31,9 @@ func parseFlagTag(field reflect.StructField, options opts) (*Flag, *tag.MultiTag
 		return nil, flagTags, nil
 	}
 
-	flag.DefValue = flagTags.GetMany("default")
+	setFlagDefaultValues(flag, flagTags.GetMany("default"))
 	setFlagChoices(flag, flagTags.GetMany("choice"))
-	flag.OptionalValue = flagTags.GetMany("optional-value")
+	setFlagOptionalValues(flag, flagTags.GetMany("optional-value"))
 
 	if options.Prefix != "" && !ignorePrefix {
 		flag.Name = options.Prefix + flag.Name
@@ -186,6 +186,16 @@ func parseEnvTag(flagName string, field reflect.StructField, options opts) strin
 	return envVar
 }
 
+func setFlagDefaultValues(flag *Flag, choices []string) {
+	var allChoices []string
+
+	for _, choice := range choices {
+		allChoices = append(allChoices, strings.Split(choice, " ")...)
+	}
+
+	flag.DefValue = allChoices
+}
+
 func setFlagChoices(flag *Flag, choices []string) {
 	var allChoices []string
 
@@ -196,6 +206,16 @@ func setFlagChoices(flag *Flag, choices []string) {
 	flag.Choices = allChoices
 }
 
+func setFlagOptionalValues(flag *Flag, choices []string) {
+	var allChoices []string
+
+	for _, choice := range choices {
+		allChoices = append(allChoices, strings.Split(choice, " ")...)
+	}
+
+	flag.OptionalValue = allChoices
+}
+
 func hasOption(options []string, option string) bool {
 	for _, opt := range options {
 		if opt == option {