Refactor: replace interface{} with any

Author: tiendc

csvlib.go

@@ -43,9 +43,9 @@ type EncodeFunc func(v reflect.Value, omitempty bool) (string, error)
 type ProcessorFunc func(s string) string
 
 // ValidatorFunc function to validate the values of decoded cells
-type ValidatorFunc func(v interface{}) error
+type ValidatorFunc func(v any) error
 
-type ParameterMap map[string]interface{}
+type ParameterMap map[string]any
 
 // LocalizationFunc function to translate message into a specific language
 type LocalizationFunc func(key string, params ParameterMap) (string, error)
@@ -83,7 +83,7 @@ func Marshal(v any, options ...EncodeOption) ([]byte, error) {
 }
 
 // GetHeaderDetails get CSV header details from the given struct type
-func GetHeaderDetails(v interface{}, tagName string) (columnDetails []ColumnDetail, err error) {
+func GetHeaderDetails(v any, tagName string) (columnDetails []ColumnDetail, err error) {
 	t := reflect.TypeOf(v)
 	t = indirectType(t)
 	if t.Kind() != reflect.Struct {
@@ -108,7 +108,7 @@ func GetHeaderDetails(v interface{}, tagName string) (columnDetails []ColumnDeta
 }
 
 // GetHeader get CSV header from the given struct
-func GetHeader(v interface{}, tagName string) ([]string, error) {
+func GetHeader(v any, tagName string) ([]string, error) {
 	details, err := GetHeaderDetails(v, tagName)
 	if err != nil {
 		return nil, err

decoder.go

@@ -156,7 +156,7 @@ func NewDecoder(r Reader, options ...DecodeOption) *Decoder {
 
 // Decode decode input data and store the result in the given variable
 // The input var must be a pointer to a slice, e.g. `*[]Student` (recommended) or `*[]*Student`
-func (d *Decoder) Decode(v interface{}) (*DecodeResult, error) {
+func (d *Decoder) Decode(v any) (*DecodeResult, error) {
 	if d.finished {
 		return nil, ErrFinished
 	}
@@ -220,7 +220,7 @@ func (d *Decoder) Decode(v interface{}) (*DecodeResult, error) {
 // The input var must be a pointer to a struct (e.g. *Student)
 // This func returns error of the current row processing only, after finishing the last row decoding,
 // call Finish() to get the overall result and error.
-func (d *Decoder) DecodeOne(v interface{}) error {
+func (d *Decoder) DecodeOne(v any) error {
 	if d.finished {
 		return ErrFinished
 	}

decoder_test.go

@@ -931,16 +931,16 @@ func Test_Decode_specialCases(t *testing.T) {
 }
 
 func Test_Decode_specialTypes(t *testing.T) {
-	t.Run("#1: interface{} type", func(t *testing.T) {
+	t.Run("#1: any type", func(t *testing.T) {
 		data := gofn.MultilineString(`col1,col2
 			1,2.2
 			100,3.3`)
 
 		type Item struct {
 			ColX bool `csv:",optional"`
 			ColY bool
-			Col1 int         `csv:"col1"`
-			Col2 interface{} `csv:"col2"`
+			Col1 int `csv:"col1"`
+			Col2 any `csv:"col2"`
 		}
 
 		var v []Item
@@ -950,24 +950,24 @@ func Test_Decode_specialTypes(t *testing.T) {
 		assert.Equal(t, []Item{{Col1: 1, Col2: "2.2"}, {Col1: 100, Col2: "3.3"}}, v)
 	})
 
-	t.Run("#2: ptr interface{} type", func(t *testing.T) {
+	t.Run("#2: ptr to any type", func(t *testing.T) {
 		data := gofn.MultilineString(`col1,col2
 			1,2.2
 			100,3.3`)
 
 		type Item struct {
 			ColX bool `csv:",optional"`
 			ColY bool
-			Col1 int          `csv:"col1"`
-			Col2 *interface{} `csv:"col2"`
+			Col1 int  `csv:"col1"`
+			Col2 *any `csv:"col2"`
 		}
 
 		var v []Item
 		ret, err := makeDecoder(data).Decode(&v)
 		assert.Nil(t, err)
 		assert.Equal(t, 3, ret.TotalRow())
-		assert.Equal(t, []Item{{Col1: 1, Col2: gofn.New[interface{}]("2.2")},
-			{Col1: 100, Col2: gofn.New[interface{}]("3.3")}}, v)
+		assert.Equal(t, []Item{{Col1: 1, Col2: gofn.New[any]("2.2")},
+			{Col1: 100, Col2: gofn.New[any]("3.3")}}, v)
 	})
 
 	t.Run("#3: all base types", func(t *testing.T) {

encoder.go

@@ -87,7 +87,7 @@ func NewEncoder(w Writer, options ...EncodeOption) *Encoder {
 
 // Encode encode input data stored in the given variable
 // The input var must be a slice, e.g. `[]Student` or `[]*Student`
-func (e *Encoder) Encode(v interface{}) error {
+func (e *Encoder) Encode(v any) error {
 	if e.finished {
 		return ErrFinished
 	}
@@ -130,7 +130,7 @@ func (e *Encoder) Encode(v interface{}) error {
 }
 
 // EncodeOne encode single object into a single CSV row
-func (e *Encoder) EncodeOne(v interface{}) error {
+func (e *Encoder) EncodeOne(v any) error {
 	if e.finished {
 		return ErrFinished
 	}

encoder_test.go

@@ -756,10 +756,10 @@ func Test_Encode_specialCases(t *testing.T) {
 }
 
 func Test_Encode_specialTypes(t *testing.T) {
-	t.Run("#1: interface{} type", func(t *testing.T) {
+	t.Run("#1: any type", func(t *testing.T) {
 		type Item struct {
-			Col1 int         `csv:"col1"`
-			Col2 interface{} `csv:"col2"`
+			Col1 int `csv:"col1"`
+			Col2 any `csv:"col2"`
 		}
 
 		v := []Item{
@@ -779,17 +779,17 @@ func Test_Encode_specialTypes(t *testing.T) {
 			`), string(data))
 	})
 
-	t.Run("#2: ptr interface{} type", func(t *testing.T) {
+	t.Run("#2: ptr to any type", func(t *testing.T) {
 		type Item struct {
-			Col1 int          `csv:"col1"`
-			Col2 *interface{} `csv:"col2"`
+			Col1 int  `csv:"col1"`
+			Col2 *any `csv:"col2"`
 		}
 
 		v := []*Item{
-			{Col1: 1, Col2: gofn.New[interface{}](2.123)},
+			{Col1: 1, Col2: gofn.New[any](2.123)},
 			nil,
-			{Col1: 100, Col2: gofn.New[interface{}]("200")},
-			{Col1: 100, Col2: gofn.New[interface{}](true)},
+			{Col1: 100, Col2: gofn.New[any]("200")},
+			{Col1: 100, Col2: gofn.New[any](true)},
 		}
 		data, err := doEncode(v)
 		assert.Nil(t, err)

errors.go

@@ -182,7 +182,7 @@ func (e *RowErrors) Unwrap() []error {
 
 type CellError struct {
 	err             error
-	fields          map[string]interface{}
+	fields          map[string]any
 	localizationKey string
 
 	column int
@@ -191,7 +191,7 @@ type CellError struct {
 }
 
 func NewCellError(err error, column int, header string) *CellError {
-	return &CellError{err: err, column: column, header: header, fields: map[string]interface{}{}}
+	return &CellError{err: err, column: column, header: header, fields: map[string]any{}}
 }
 
 func (e *CellError) Error() string {
@@ -225,7 +225,7 @@ func (e *CellError) Unwrap() error {
 	return e.err
 }
 
-func (e *CellError) WithParam(k string, v interface{}) *CellError {
+func (e *CellError) WithParam(k string, v any) *CellError {
 	e.fields[k] = v
 	return e
 }

reflect.go

@@ -4,15 +4,6 @@ import (
 	"reflect"
 )
 
-// func isKindOf(k reflect.Kind, kinds ...reflect.Kind) bool {
-//	for _, kk := range kinds {
-//		if k == kk {
-//			return true
-//		}
-//	}
-//	return false
-// }
-
 func isKindOrPtrOf(t reflect.Type, kinds ...reflect.Kind) bool {
 	k := t.Kind()
 	if k == reflect.Pointer {

validator.go

@@ -10,7 +10,7 @@ import (
 
 // ValidatorLT validate a value to be less than the given value
 func ValidatorLT[T LTComparable](val T) ValidatorFunc {
-	return func(v interface{}) error {
+	return func(v any) error {
 		v1, ok := v.(T)
 		if !ok {
 			return errValidationConversion(v, v1)
@@ -24,7 +24,7 @@ func ValidatorLT[T LTComparable](val T) ValidatorFunc {
 
 // ValidatorLTE validate a value to be less than or equal to the given value
 func ValidatorLTE[T LTComparable](val T) ValidatorFunc {
-	return func(v interface{}) error {
+	return func(v any) error {
 		v1, ok := v.(T)
 		if !ok {
 			return errValidationConversion(v, v1)
@@ -38,7 +38,7 @@ func ValidatorLTE[T LTComparable](val T) ValidatorFunc {
 
 // ValidatorGT validate a value to be greater than the given value
 func ValidatorGT[T LTComparable](val T) ValidatorFunc {
-	return func(v interface{}) error {
+	return func(v any) error {
 		v1, ok := v.(T)
 		if !ok {
 			return errValidationConversion(v, v1)
@@ -52,7 +52,7 @@ func ValidatorGT[T LTComparable](val T) ValidatorFunc {
 
 // ValidatorGTE validate a value to be greater than or equal to the given value
 func ValidatorGTE[T LTComparable](val T) ValidatorFunc {
-	return func(v interface{}) error {
+	return func(v any) error {
 		v1, ok := v.(T)
 		if !ok {
 			return errValidationConversion(v, v1)
@@ -66,7 +66,7 @@ func ValidatorGTE[T LTComparable](val T) ValidatorFunc {
 
 // ValidatorRange validate a value to be in the given range (min and max are inclusive)
 func ValidatorRange[T LTComparable](min, max T) ValidatorFunc {
-	return func(v interface{}) error {
+	return func(v any) error {
 		v1, ok := v.(T)
 		if !ok {
 			return errValidationConversion(v, v1)
@@ -80,7 +80,7 @@ func ValidatorRange[T LTComparable](min, max T) ValidatorFunc {
 
 // ValidatorIN validate a value to be one of the specific values
 func ValidatorIN[T LTComparable](vals ...T) ValidatorFunc {
-	return func(v interface{}) error {
+	return func(v any) error {
 		v1, ok := v.(T)
 		if !ok {
 			return errValidationConversion(v, v1)
@@ -97,7 +97,7 @@ func ValidatorIN[T LTComparable](vals ...T) ValidatorFunc {
 // ValidatorStrLen validate a string to have length in the given range
 // Pass argument -1 to skip the equivalent validation.
 func ValidatorStrLen[T StringEx](minLen, maxLen int, lenFuncs ...func(s string) int) ValidatorFunc {
-	return func(v interface{}) error {
+	return func(v any) error {
 		s, ok := v.(T)
 		if !ok {
 			return errValidationConversion(v, s)
@@ -116,7 +116,7 @@ func ValidatorStrLen[T StringEx](minLen, maxLen int, lenFuncs ...func(s string)
 
 // ValidatorStrPrefix validate a string to have prefix matching the given one
 func ValidatorStrPrefix[T StringEx](prefix string) ValidatorFunc {
-	return func(v interface{}) error {
+	return func(v any) error {
 		s, ok := v.(T)
 		if !ok {
 			return errValidationConversion(v, s)
@@ -130,7 +130,7 @@ func ValidatorStrPrefix[T StringEx](prefix string) ValidatorFunc {
 
 // ValidatorStrSuffix validate a string to have suffix matching the given one
 func ValidatorStrSuffix[T StringEx](suffix string) ValidatorFunc {
-	return func(v interface{}) error {
+	return func(v any) error {
 		s, ok := v.(T)
 		if !ok {
 			return errValidationConversion(v, s)
@@ -142,6 +142,6 @@ func ValidatorStrSuffix[T StringEx](suffix string) ValidatorFunc {
 	}
 }
 
-func errValidationConversion[T any](v1 interface{}, v2 T) error {
+func errValidationConversion[T any](v1 any, v2 T) error {
 	return fmt.Errorf("%w: (%v -> %v)", ErrValidationConversion, reflect.TypeOf(v1), reflect.TypeOf(v2))
 }