Fill in tracing on command flag value accessor funcs

meatballhat · meatballhat · commit ef500f2b73d1 · 2023-06-28T18:36:24.000-04:00
diff --git a/flag_float.go b/flag_float.go
@@ -39,7 +39,10 @@ func (f *floatValue) String() string { return strconv.FormatFloat(float64(*f), '
 // 0 if not found
 func (cmd *Command) Float(name string) float64 {
 	if v, ok := cmd.Value(name).(float64); ok {
+		tracef("float available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmd.Name)
 		return v
 	}
+
+	tracef("float NOT available for flag name %[1]q (cmd=%[2]q)", name, cmd.Name)
 	return 0
 }
diff --git a/flag_float_slice.go b/flag_float_slice.go
@@ -12,18 +12,22 @@ var NewFloatSlice = NewSliceBase[float64, NoConfig, floatValue]
 // FloatSlice looks up the value of a local FloatSliceFlag, returns
 // nil if not found
 func (cmd *Command) FloatSlice(name string) []float64 {
-	if fs := cmd.lookupFlagSet(name); fs != nil {
-		return lookupFloatSlice(name, fs)
+	if flSet := cmd.lookupFlagSet(name); flSet != nil {
+		return lookupFloatSlice(name, flSet, cmd.Name)
 	}
+
 	return nil
 }
 
-func lookupFloatSlice(name string, set *flag.FlagSet) []float64 {
-	f := set.Lookup(name)
-	if f != nil {
-		if slice, ok := f.Value.(flag.Getter).Get().([]float64); ok {
-			return slice
+func lookupFloatSlice(name string, set *flag.FlagSet, cmdName string) []float64 {
+	fl := set.Lookup(name)
+	if fl != nil {
+		if v, ok := fl.Value.(flag.Getter).Get().([]float64); ok {
+			tracef("float slice available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmdName)
+			return v
 		}
 	}
+
+	tracef("float slice NOT available for flag name %[1]q (cmd=%[2]q)", name, cmdName)
 	return nil
 }
diff --git a/flag_int.go b/flag_int.go
@@ -50,7 +50,10 @@ func (i *intValue) String() string { return strconv.FormatInt(int64(*i.val), 10)
 // 0 if not found
 func (cmd *Command) Int(name string) int64 {
 	if v, ok := cmd.Value(name).(int64); ok {
+		tracef("int available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmd.Name)
 		return v
 	}
+
+	tracef("int NOT available for flag name %[1]q (cmd=%[2]q)", name, cmd.Name)
 	return 0
 }
diff --git a/flag_int_slice.go b/flag_int_slice.go
@@ -9,8 +9,10 @@ var NewIntSlice = NewSliceBase[int64, IntegerConfig, intValue]
 // nil if not found
 func (cmd *Command) IntSlice(name string) []int64 {
 	if v, ok := cmd.Value(name).([]int64); ok {
+		tracef("int slice available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmd.Name)
 		return v
 	}
 
+	tracef("int slice NOT available for flag name %[1]q (cmd=%[2]q)", name, cmd.Name)
 	return nil
 }
diff --git a/flag_string.go b/flag_string.go
@@ -57,7 +57,10 @@ func (s *stringValue) String() string {
 
 func (cmd *Command) String(name string) string {
 	if v, ok := cmd.Value(name).(string); ok {
+		tracef("string available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmd.Name)
 		return v
 	}
+
+	tracef("string NOT available for flag name %[1]q (cmd=%[2]q)", name, cmd.Name)
 	return ""
 }
diff --git a/flag_string_map.go b/flag_string_map.go
@@ -9,7 +9,10 @@ var NewStringMap = NewMapBase[string, StringConfig, stringValue]
 // nil if not found
 func (cmd *Command) StringMap(name string) map[string]string {
 	if v, ok := cmd.Value(name).(map[string]string); ok {
+		tracef("string map available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmd.Name)
 		return v
 	}
+
+	tracef("string map NOT available for flag name %[1]q (cmd=%[2]q)", name, cmd.Name)
 	return nil
 }
diff --git a/flag_string_slice.go b/flag_string_slice.go
@@ -9,7 +9,10 @@ var NewStringSlice = NewSliceBase[string, StringConfig, stringValue]
 // nil if not found
 func (cmd *Command) StringSlice(name string) []string {
 	if v, ok := cmd.Value(name).([]string); ok {
+		tracef("string slice available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmd.Name)
 		return v
 	}
+
+	tracef("string slice NOT available for flag name %[1]q (cmd=%[2]q)", name, cmd.Name)
 	return nil
 }
diff --git a/flag_timestamp.go b/flag_timestamp.go
@@ -87,16 +87,23 @@ func (t *timestampValue) Get() any {
 // Timestamp gets the timestamp from a flag name
 func (cmd *Command) Timestamp(name string) *time.Time {
 	if fs := cmd.lookupFlagSet(name); fs != nil {
-		return lookupTimestamp(name, fs)
+		return lookupTimestamp(name, fs, cmd.Name)
 	}
 	return nil
 }
 
 // Fetches the timestamp value from the local timestampWrap
-func lookupTimestamp(name string, set *flag.FlagSet) *time.Time {
-	f := set.Lookup(name)
-	if f != nil {
-		return (f.Value.(*timestampValue)).Value()
+func lookupTimestamp(name string, set *flag.FlagSet, cmdName string) *time.Time {
+	fl := set.Lookup(name)
+	if fl != nil {
+		if tv, ok := fl.Value.(*timestampValue); ok {
+			v := tv.Value()
+
+			tracef("timestamp available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmdName)
+			return v
+		}
 	}
+
+	tracef("timestamp NOT available for flag name %[1]q (cmd=%[2]q)", name, cmdName)
 	return nil
 }
diff --git a/flag_uint.go b/flag_uint.go
@@ -45,7 +45,10 @@ func (i *uintValue) String() string { return strconv.FormatUint(uint64(*i.val),
 // 0 if not found
 func (cmd *Command) Uint(name string) uint64 {
 	if v, ok := cmd.Value(name).(uint64); ok {
+		tracef("uint available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmd.Name)
 		return v
 	}
+
+	tracef("uint NOT available for flag name %[1]q (cmd=%[2]q)", name, cmd.Name)
 	return 0
 }
diff --git a/flag_uint_slice.go b/flag_uint_slice.go
@@ -9,7 +9,10 @@ var NewUintSlice = NewSliceBase[uint64, IntegerConfig, uintValue]
 // nil if not found
 func (cmd *Command) UintSlice(name string) []uint64 {
 	if v, ok := cmd.Value(name).([]uint64); ok {
+		tracef("uint slice available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmd.Name)
 		return v
 	}
+
+	tracef("uint slice NOT available for flag name %[1]q (cmd=%[2]q)", name, cmd.Name)
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,10 @@ func (f floatValue) String() string { return strconv.FormatFloat(float64(f), '`
`39`	`39`	`// 0 if not found`
`40`	`40`	`func (cmd *Command) Float(name string) float64 {`
`41`	`41`	`if v, ok := cmd.Value(name).(float64); ok {`
	`42`	`+ tracef("float available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmd.Name)`
`42`	`43`	`return v`
`43`	`44`	`}`
	`45`	`+`
	`46`	`+ tracef("float NOT available for flag name %[1]q (cmd=%[2]q)", name, cmd.Name)`
`44`	`47`	`return 0`
`45`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,18 +12,22 @@ var NewFloatSlice = NewSliceBase[float64, NoConfig, floatValue]`
`12`	`12`	`// FloatSlice looks up the value of a local FloatSliceFlag, returns`
`13`	`13`	`// nil if not found`
`14`	`14`	`func (cmd *Command) FloatSlice(name string) []float64 {`
`15`		`- if fs := cmd.lookupFlagSet(name); fs != nil {`
`16`		`- return lookupFloatSlice(name, fs)`
	`15`	`+ if flSet := cmd.lookupFlagSet(name); flSet != nil {`
	`16`	`+ return lookupFloatSlice(name, flSet, cmd.Name)`
`17`	`17`	`}`
	`18`	`+`
`18`	`19`	`return nil`
`19`	`20`	`}`
`20`	`21`
`21`		`-func lookupFloatSlice(name string, set *flag.FlagSet) []float64 {`
`22`		`- f := set.Lookup(name)`
`23`		`- if f != nil {`
`24`		`- if slice, ok := f.Value.(flag.Getter).Get().([]float64); ok {`
`25`		`- return slice`
	`22`	`+func lookupFloatSlice(name string, set *flag.FlagSet, cmdName string) []float64 {`
	`23`	`+ fl := set.Lookup(name)`
	`24`	`+ if fl != nil {`
	`25`	`+ if v, ok := fl.Value.(flag.Getter).Get().([]float64); ok {`
	`26`	`+ tracef("float slice available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmdName)`
	`27`	`+ return v`
`26`	`28`	`}`
`27`	`29`	`}`
	`30`	`+`
	`31`	`+ tracef("float slice NOT available for flag name %[1]q (cmd=%[2]q)", name, cmdName)`
`28`	`32`	`return nil`
`29`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,10 @@ func (i intValue) String() string { return strconv.FormatInt(int64(i.val), 10)`
`50`	`50`	`// 0 if not found`
`51`	`51`	`func (cmd *Command) Int(name string) int64 {`
`52`	`52`	`if v, ok := cmd.Value(name).(int64); ok {`
	`53`	`+ tracef("int available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmd.Name)`
`53`	`54`	`return v`
`54`	`55`	`}`
	`56`	`+`
	`57`	`+ tracef("int NOT available for flag name %[1]q (cmd=%[2]q)", name, cmd.Name)`
`55`	`58`	`return 0`
`56`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,10 @@ var NewIntSlice = NewSliceBase[int64, IntegerConfig, intValue]`
`9`	`9`	`// nil if not found`
`10`	`10`	`func (cmd *Command) IntSlice(name string) []int64 {`
`11`	`11`	`if v, ok := cmd.Value(name).([]int64); ok {`
	`12`	`+ tracef("int slice available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmd.Name)`
`12`	`13`	`return v`
`13`	`14`	`}`
`14`	`15`
	`16`	`+ tracef("int slice NOT available for flag name %[1]q (cmd=%[2]q)", name, cmd.Name)`
`15`	`17`	`return nil`
`16`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,10 @@ func (s *stringValue) String() string {`
`57`	`57`
`58`	`58`	`func (cmd *Command) String(name string) string {`
`59`	`59`	`if v, ok := cmd.Value(name).(string); ok {`
	`60`	`+ tracef("string available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmd.Name)`
`60`	`61`	`return v`
`61`	`62`	`}`
	`63`	`+`
	`64`	`+ tracef("string NOT available for flag name %[1]q (cmd=%[2]q)", name, cmd.Name)`
`62`	`65`	`return ""`
`63`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,10 @@ var NewStringMap = NewMapBase[string, StringConfig, stringValue]`
`9`	`9`	`// nil if not found`
`10`	`10`	`func (cmd *Command) StringMap(name string) map[string]string {`
`11`	`11`	`if v, ok := cmd.Value(name).(map[string]string); ok {`
	`12`	`+ tracef("string map available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmd.Name)`
`12`	`13`	`return v`
`13`	`14`	`}`
	`15`	`+`
	`16`	`+ tracef("string map NOT available for flag name %[1]q (cmd=%[2]q)", name, cmd.Name)`
`14`	`17`	`return nil`
`15`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,10 @@ var NewStringSlice = NewSliceBase[string, StringConfig, stringValue]`
`9`	`9`	`// nil if not found`
`10`	`10`	`func (cmd *Command) StringSlice(name string) []string {`
`11`	`11`	`if v, ok := cmd.Value(name).([]string); ok {`
	`12`	`+ tracef("string slice available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmd.Name)`
`12`	`13`	`return v`
`13`	`14`	`}`
	`15`	`+`
	`16`	`+ tracef("string slice NOT available for flag name %[1]q (cmd=%[2]q)", name, cmd.Name)`
`14`	`17`	`return nil`
`15`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,10 @@ func (i uintValue) String() string { return strconv.FormatUint(uint64(i.val),`
`45`	`45`	`// 0 if not found`
`46`	`46`	`func (cmd *Command) Uint(name string) uint64 {`
`47`	`47`	`if v, ok := cmd.Value(name).(uint64); ok {`
	`48`	`+ tracef("uint available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmd.Name)`
`48`	`49`	`return v`
`49`	`50`	`}`
	`51`	`+`
	`52`	`+ tracef("uint NOT available for flag name %[1]q (cmd=%[2]q)", name, cmd.Name)`
`50`	`53`	`return 0`
`51`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,10 @@ var NewUintSlice = NewSliceBase[uint64, IntegerConfig, uintValue]`
`9`	`9`	`// nil if not found`
`10`	`10`	`func (cmd *Command) UintSlice(name string) []uint64 {`
`11`	`11`	`if v, ok := cmd.Value(name).([]uint64); ok {`
	`12`	`+ tracef("uint slice available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmd.Name)`
`12`	`13`	`return v`
`13`	`14`	`}`
	`15`	`+`
	`16`	`+ tracef("uint slice NOT available for flag name %[1]q (cmd=%[2]q)", name, cmd.Name)`
`14`	`17`	`return nil`
`15`	`18`	`}`