From bb0497193385933de72816bfc6d089b694de8229 Mon Sep 17 00:00:00 2001
From: marrow16 <martin.rowlinson16@gmail.com>
Date: Thu, 23 Jan 2025 20:37:01 +0000
Subject: [PATCH] Support for embedded structs in `ValidatorFor`

---
 README.md                                     |  4 +--
 .../custom_tag_tokens_test.go                 |  0
 {examples => _examples}/polymorphic_test.go   |  0
 {examples => _examples}/tag_aliases_test.go   |  0
 validator_for.go                              | 18 +++++++---
 validator_for_test.go                         | 34 +++++++++++++++++++
 6 files changed, 50 insertions(+), 6 deletions(-)
 rename {examples => _examples}/custom_tag_tokens_test.go (100%)
 rename {examples => _examples}/polymorphic_test.go (100%)
 rename {examples => _examples}/tag_aliases_test.go (100%)

diff --git a/README.md b/README.md
index cd0e75d..5267f72 100644
--- a/README.md
+++ b/README.md
@@ -1119,13 +1119,13 @@ the above will check the properties in order specified by their <code>order:</co
 The `v8n` tag can also support custom tokens which can be registered using `valix.RegisterCustomTagToken`.
 Any registered custom tag tokens can be used in the `v8n` tag and will be processed when building a validator for a struct using `valix.ValidatorFor`
 
-An example of how this is used can be found in [examples/custom_tag_tokens_test.go](https://github.com/marrow16/valix/blob/master/examples/custom_tag_tokens_test.go)
+An example of how this is used can be found in [_examples/custom_tag_tokens_test.go](https://github.com/marrow16/valix/blob/master/examples/custom_tag_tokens_test.go)
 
 #### Tag token aliases
 
 If you find that you're using the same `v8n` tag tokens repeatedly - you can create aliases for these and then just reference the alias using a `$` prefix.
 
-An example of how this is used can be found in [examples/tag_aliases_test.go](https://github.com/marrow16/valix/blob/master/examples/tag_aliases_test.go)
+An example of how this is used can be found in [_examples/tag_aliases_test.go](https://github.com/marrow16/valix/blob/master/examples/tag_aliases_test.go)
 
 #### Abbreviating constraints in tags
 
diff --git a/examples/custom_tag_tokens_test.go b/_examples/custom_tag_tokens_test.go
similarity index 100%
rename from examples/custom_tag_tokens_test.go
rename to _examples/custom_tag_tokens_test.go
diff --git a/examples/polymorphic_test.go b/_examples/polymorphic_test.go
similarity index 100%
rename from examples/polymorphic_test.go
rename to _examples/polymorphic_test.go
diff --git a/examples/tag_aliases_test.go b/_examples/tag_aliases_test.go
similarity index 100%
rename from examples/tag_aliases_test.go
rename to _examples/tag_aliases_test.go
diff --git a/validator_for.go b/validator_for.go
index cf16eb7..d6df75e 100644
--- a/validator_for.go
+++ b/validator_for.go
@@ -92,13 +92,23 @@ func buildPropertyValidators(ty reflect.Type, ignoreOas bool) (Properties, error
 	newTy := reflect.New(ty)
 	for i := 0; i < cnt; i++ {
 		fld := ty.Field(i)
-		actualFld := newTy.Elem().FieldByName(fld.Name)
-		if actualFld.CanSet() {
-			pv, fn, err := propertyValidatorFromField(fld, ignoreOas)
+		if fld.Anonymous {
+			embeddedPtys, err := buildPropertyValidators(fld.Type, ignoreOas)
 			if err != nil {
 				return nil, err
 			}
-			result[fn] = pv
+			for k, v := range embeddedPtys {
+				result[k] = v
+			}
+		} else {
+			actualFld := newTy.Elem().FieldByName(fld.Name)
+			if actualFld.CanSet() {
+				pv, fn, err := propertyValidatorFromField(fld, ignoreOas)
+				if err != nil {
+					return nil, err
+				}
+				result[fn] = pv
+			}
 		}
 	}
 	return result, nil
diff --git a/validator_for_test.go b/validator_for_test.go
index 592614b..c62495f 100644
--- a/validator_for_test.go
+++ b/validator_for_test.go
@@ -3,6 +3,7 @@ package valix
 import (
 	"errors"
 	"fmt"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
@@ -779,3 +780,36 @@ func TestOptionIgnoreOasTags(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, v)
 }
+
+func TestValidatorFor_Embedded(t *testing.T) {
+	type abstractStruct struct {
+		Aaa string `json:"aaa"`
+	}
+	type baseStruct struct {
+		abstractStruct
+		Foo string `json:"foo"`
+		Bar string `json:"bar"`
+	}
+	type myStruct struct {
+		baseStruct
+		Baz string `json:"baz"`
+	}
+	v, err := ValidatorFor(myStruct{}, nil)
+	require.NoError(t, err)
+	require.NotNil(t, v)
+	require.Equal(t, 4, len(v.Properties))
+
+	testJson := `{
+"aaa": "aaa",
+"foo": "foo",
+"bar": "bar",
+"baz": "baz"}`
+	my := &myStruct{}
+	ok, violations, _ := v.ValidateStringInto(testJson, my)
+	require.True(t, ok)
+	require.Equal(t, 0, len(violations))
+	assert.Equal(t, "aaa", my.Aaa)
+	assert.Equal(t, "foo", my.Foo)
+	assert.Equal(t, "bar", my.Bar)
+	assert.Equal(t, "baz", my.Baz)
+}