fix: decoder panics on tag not found (#100)

Author: abemedia

.golangci.yml

@@ -50,6 +50,7 @@ issues:
   exclude-rules:
     - path: (.+)_test.go
       linters:
+        - cyclop
         - errcheck
         - errorlint
         - funlen

decoder/compile.go

@@ -9,7 +9,9 @@ import (
 	"github.com/abemedia/go-don/internal/byteconv"
 )
 
-type decoder func(reflect.Value, Getter) error
+type decoder = func(reflect.Value, Getter) error
+
+func noopDecoder(reflect.Value, Getter) error { return nil }
 
 var unmarshalerType = reflect.TypeOf((*encoding.TextUnmarshaler)(nil)).Elem()
 

decoder/decode.go

@@ -26,7 +26,12 @@ func New(tag string) *Decoder {
 }
 
 func (d *Decoder) Decode(data Getter, v any) error {
-	val := reflect.ValueOf(v).Elem()
+	val := reflect.ValueOf(v)
+	if val.Kind() != reflect.Pointer {
+		return ErrUnsupportedType
+	}
+
+	val = val.Elem()
 	if val.Kind() != reflect.Struct {
 		return ErrUnsupportedType
 	}
@@ -37,8 +42,11 @@ func (d *Decoder) Decode(data Getter, v any) error {
 	if !ok {
 		var err error
 		dec, err = compile(t, d.tag, t.Kind() == reflect.Ptr)
-		if err != nil && err != ErrTagNotFound { //nolint:errorlint,goerr113
-			return err
+		if err != nil {
+			if err != ErrTagNotFound { //nolint:errorlint,goerr113
+				return err
+			}
+			dec = noopDecoder
 		}
 
 		d.cache.Store(t, dec)

decoder/decode_test.go

@@ -1,6 +1,7 @@
 package decoder_test
 
 import (
+	"reflect"
 	"testing"
 
 	"github.com/abemedia/go-don/decoder"
@@ -80,62 +81,83 @@ func TestDecode(t *testing.T) {
 		},
 	}
 
-	dec := decoder.New("field")
-
-	actual := &test{}
-	if err := dec.Decode(in, actual); err != nil {
-		t.Fatal(err)
-	}
-
-	if diff := cmp.Diff(expected, actual); diff != "" {
-		t.Errorf(diff)
-	}
-}
-
-func TestCached(t *testing.T) {
-	type test struct {
-		String string `field:"string"`
-	}
-
-	in := decoder.Map{"string": {"string"}}
-	expected := &test{String: "string"}
-
-	dec, err := decoder.NewCached(test{}, "field")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	actual := &test{}
-
-	if err = dec.Decode(in, actual); err != nil {
-		t.Fatal(err)
-	}
-
-	if diff := cmp.Diff(expected, actual); diff != "" {
-		t.Errorf(diff)
-	}
+	t.Run("Decoder", func(t *testing.T) {
+		dec := decoder.New("field")
+		actual := &test{}
+		if err := dec.Decode(in, actual); err != nil {
+			t.Fatal(err)
+		}
+		if diff := cmp.Diff(expected, actual); diff != "" {
+			t.Errorf(diff)
+		}
+	})
+
+	t.Run("CachedDecoder", func(t *testing.T) {
+		dec, err := decoder.NewCached(test{}, "field")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		actual := &test{}
+		if err := dec.Decode(in, actual); err != nil {
+			t.Fatal(err)
+		}
+		if diff := cmp.Diff(expected, actual); diff != "" {
+			t.Errorf(diff)
+		}
+
+		actual = &test{}
+		val := reflect.ValueOf(actual).Elem()
+		if err = dec.DecodeValue(in, val); err != nil {
+			t.Fatal(err)
+		}
+		if diff := cmp.Diff(expected, actual); diff != "" {
+			t.Errorf(diff)
+		}
+	})
+
+	t.Run("CachedDecoder_NilPointer", func(t *testing.T) {
+		dec, err := decoder.NewCached(&test{}, "field")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		var actual *test
+		if err := dec.Decode(in, &actual); err != nil {
+			t.Fatal(err)
+		}
+		if diff := cmp.Diff(expected, actual); diff != "" {
+			t.Errorf(diff)
+		}
+	})
 }
 
-func TestCachedNil(t *testing.T) {
-	type test struct {
-		String string `field:"string"`
+func TestDecodeError(t *testing.T) {
+	type noTag struct {
+		Test string `json:"test"`
 	}
-
-	in := decoder.Map{"string": {"string"}}
-	expected := &test{String: "string"}
-
-	dec, err := decoder.NewCached(&test{}, "field")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var actual *test
-
-	if err = dec.Decode(in, &actual); err != nil {
-		t.Fatal(err)
-	}
-
-	if diff := cmp.Diff(expected, actual); diff != "" {
-		t.Errorf(diff)
+	type unsupportedType struct {
+		Test chan string `field:"test"`
 	}
+	s := ""
+	tests := []any{"", &s, 1, noTag{}, &unsupportedType{}}
+
+	t.Run("Decoder", func(t *testing.T) {
+		for _, test := range tests {
+			dec := decoder.New("field")
+			err := dec.Decode(nil, test)
+			if err == nil {
+				t.Errorf("should return error for %T", test)
+			}
+		}
+	})
+
+	t.Run("CachedDecoder", func(t *testing.T) {
+		for _, test := range tests {
+			_, err := decoder.NewCached(test, "field")
+			if err == nil {
+				t.Errorf("should return error for %T", test)
+			}
+		}
+	})
 }