refactor: merge getIntSlice and getFloatSlice

Author: ldez

flag_float_slice.go

@@ -18,28 +18,17 @@ var (
 // FloatSlice looks up the value of a local FloatSliceFlag, returns
 // nil if not found
 func (cmd *Command) FloatSlice(name string) []float64 {
-	return getFloatSlice[float64](cmd, name)
+	return getNumberSlice[float64](cmd, name)
 }
 
 // Float32Slice looks up the value of a local Float32Slice, returns
 // nil if not found
 func (cmd *Command) Float32Slice(name string) []float32 {
-	return getFloatSlice[float32](cmd, name)
+	return getNumberSlice[float32](cmd, name)
 }
 
 // Float64Slice looks up the value of a local Float64SliceFlag, returns
 // nil if not found
 func (cmd *Command) Float64Slice(name string) []float64 {
-	return getFloatSlice[float64](cmd, name)
-}
-
-func getFloatSlice[T float32 | float64](cmd *Command, name string) []T {
-	if v, ok := cmd.Value(name).([]T); ok {
-		tracef("float slice available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", name, v, cmd.Name)
-
-		return v
-	}
-
-	tracef("float slice NOT available for flag name %[1]q (cmd=%[2]q)", name, cmd.Name)
-	return nil
+	return getNumberSlice[float64](cmd, name)
 }

flag_int_slice.go

@@ -24,40 +24,29 @@ var (
 // IntSlice looks up the value of a local IntSliceFlag, returns
 // nil if not found
 func (cmd *Command) IntSlice(name string) []int {
-	return getIntSlice[int](cmd, name)
+	return getNumberSlice[int](cmd, name)
 }
 
 // Int8Slice looks up the value of a local Int8SliceFlag, returns
 // nil if not found
 func (cmd *Command) Int8Slice(name string) []int8 {
-	return getIntSlice[int8](cmd, name)
+	return getNumberSlice[int8](cmd, name)
 }
 
 // Int16Slice looks up the value of a local Int16SliceFlag, returns
 // nil if not found
 func (cmd *Command) Int16Slice(name string) []int16 {
-	return getIntSlice[int16](cmd, name)
+	return getNumberSlice[int16](cmd, name)
 }
 
 // Int32Slice looks up the value of a local Int32SliceFlag, returns
 // nil if not found
 func (cmd *Command) Int32Slice(name string) []int32 {
-	return getIntSlice[int32](cmd, name)
+	return getNumberSlice[int32](cmd, name)
 }
 
 // Int64Slice looks up the value of a local Int64SliceFlag, returns
 // nil if not found
 func (cmd *Command) Int64Slice(name string) []int64 {
-	return getIntSlice[int64](cmd, name)
-}
-
-func getIntSlice[T int | int8 | int16 | int32 | int64](cmd *Command, name string) []T {
-	if v, ok := cmd.Value(name).([]T); 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
+	return getNumberSlice[int64](cmd, name)
 }

flag_number_slice.go

@@ -0,0 +1,15 @@
+package cli
+
+type numberType interface {
+	int | int8 | int16 | int32 | int64 | float32 | float64
+}
+
+func getNumberSlice[T numberType](cmd *Command, name string) []T {
+	if v, ok := cmd.Value(name).([]T); ok {
+		tracef("%T slice available for flag name %[1]q with value=%[2]v (cmd=%[3]q)", *new(T), name, v, cmd.Name)
+		return v
+	}
+
+	tracef("%T slice NOT available for flag name %[1]q (cmd=%[2]q)", *new(T), name, cmd.Name)
+	return nil
+}

flag_number_slice_test.go

@@ -0,0 +1,45 @@
+package cli
+
+import (
+	"io"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_getNumberSlice_int64(t *testing.T) {
+	f := &Int64SliceFlag{Name: "numbers"}
+
+	cmd := &Command{
+		Name:      "mock",
+		Flags:     []Flag{f},
+		Writer:    io.Discard,
+		ErrWriter: io.Discard,
+	}
+
+	err := f.Set("", "1,2,3")
+	require.NoError(t, err)
+
+	expected := []int64{1, 2, 3}
+
+	assert.Equal(t, expected, getNumberSlice[int64](cmd, "numbers"))
+}
+
+func Test_getNumberSlice_float64(t *testing.T) {
+	f := &Float64SliceFlag{Name: "numbers"}
+
+	cmd := &Command{
+		Name:      "mock",
+		Flags:     []Flag{f},
+		Writer:    io.Discard,
+		ErrWriter: io.Discard,
+	}
+
+	err := f.Set("", "1,2,3")
+	require.NoError(t, err)
+
+	expected := []float64{1, 2, 3}
+
+	assert.Equal(t, expected, getNumberSlice[float64](cmd, "numbers"))
+}