From 95946c187cefb6f9585e9d2852030996354fd949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Sat, 22 Mar 2025 18:50:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=8A=A8=E6=80=81=E6=95=B0?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 builder.go      | 25 +++++++++++++++++++++++--
 builder_test.go | 17 +++++++++--------
 define.go       |  6 ++++++
 3 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 define.go

diff --git a/builder.go b/builder.go
index f5147ba..80d64da 100644
--- a/builder.go
+++ b/builder.go
@@ -167,6 +167,10 @@ func (b *builderImpl) addNestedField(nameArr []string, pkg string, typ any, tag
 		jsonTag := nameArr[i]
 		fieldName := wrapper.String(jsonTag).SnakeCaseToCamel()
 		parentName := strings.Join(nameArr[:i], ".")
+		if strings.HasSuffix(parentName, "."+ArraySplit) {
+			// 数组部分处理
+			continue
+		}
 		parentJsonTag := nameArr[i-1]
 		parentFieldName := wrapper.String(parentJsonTag).SnakeCaseToCamel()
 		fieldTag := fmt.Sprintf(`json:"%s"`, parentJsonTag)
@@ -238,8 +242,25 @@ func (b *builderImpl) Build() DynamicStruct {
 				// 说明是顶层了
 				b.AddField(builderCfg.Field, "", builderCfg.Builder.Build().New(), builderCfg.Tag, false)
 			} else {
-				// (非顶层) 父级结构存在, 将其追加到父级结构中即可, 向前看一步即为父级结构
-				b.nestedStructTable[strings.Join(parentNameArr[:len(parentNameArr)-1], ".")].Builder.AddField(builderCfg.Field, "", builderCfg.Builder.Build().New(), builderCfg.Tag, false)
+				loopCnt := 0
+				buildInstance := builderCfg.Builder.Build()
+				val := buildInstance.New()
+				for {
+					// (非顶层) 父级结构存在, 将其追加到父级结构中即可, 向前看一步即为父级结构
+					parentName := strings.Join(parentNameArr[:len(parentNameArr)-1-loopCnt], ".")
+					if strings.HasSuffix(parentName, "."+ArraySplit) {
+						// 说明父级是数组
+						loopCnt++
+						val = reflect.MakeSlice(reflect.SliceOf(reflect.TypeOf(val)), 1, 1).Interface()
+						fmt.Println(val)
+						// b.nestedStructTable[parentName].Builder.AddField(builderCfg.Field, "", val, builderCfg.Tag, false)
+					} else {
+						// 父级非数组
+						b.nestedStructTable[parentName].Builder.AddField(builderCfg.Field, "", val, builderCfg.Tag, false)
+						break
+					}
+				}
+
 			}
 		}
 	}
diff --git a/builder_test.go b/builder_test.go
index 66274e6..f851174 100644
--- a/builder_test.go
+++ b/builder_test.go
@@ -14,23 +14,24 @@ import (
 )
 
 func Test_dynamicStructImpl_New(t *testing.T) {
-	instance := NewStruct().
+	instance := NewStruct(map[string]string{}).
 		/*AddField("Integer", "", 0, `json:"int"`, false).
 		AddField("Text", "", "", `json:"someText"`, false).
 		AddField("Float", "", 0.0, `json:"double"`, false).
 		AddField("Boolean", "", false, "", false).
 		AddField("Slice", "", []int{}, "", false).
 		AddField("Anonymous", "", "", `json:"-"`, false).*/
-		AddField("user.base.age", "", 20, `json:"age"`, false).
-		AddField("user.base.name", "", "", `json:"name"`, false).
-		AddField("user.job.address", "", "", `json:"address"`, false).
-		AddField("user.job.company.name", "", "", `json:"name"`, false).
+		AddField("user.[].base.age", "", 20, `json:"age"`, false).
+		AddField("user.[].base.name", "", "", `json:"name"`, false).
+		AddField("user.[].job.address", "", "", `json:"address"`, false).
+		AddField("user.[].job.company.name", "", "", `json:"name"`, false).
 		Build()
 
 	val := instance.New()
-
+	testByte, _ := json.Marshal(val)
+	fmt.Println(string(testByte))
 	data := []byte(`
-{
+{"user": [{
     "int": 123,
     "someText": "example",
     "double": 123.45,
@@ -38,7 +39,7 @@ func Test_dynamicStructImpl_New(t *testing.T) {
     "Slice": [1, 2, 3],
     "user": {"job":{"address":"beijing","company":{"name":"unknown"}}, "base":{"age": 1800, "name":"baicha"}},
     "Anonymous": "avoid to read"
-}
+}]}
 `)
 	err := json.Unmarshal(data, &val)
 	fmt.Println(err, val)
diff --git a/define.go b/define.go
new file mode 100644
index 0000000..a9e497c
--- /dev/null
+++ b/define.go
@@ -0,0 +1,6 @@
+package dynamicstruct
+
+const (
+	// ArraySplit is the string used to split array elements
+	ArraySplit = "[]"
+)