From a4274b74dd59faddb69f6e8ec2ab857736f5fef1 Mon Sep 17 00:00:00 2001
From: xing <fthvgb1@163.com>
Date: Fri, 30 Jun 2023 00:06:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20maps=20setstrval?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 helper/maps/function.go      | 52 +++++++++++++++++++++++-------------
 helper/maps/function_test.go | 16 +++++++++++
 2 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/helper/maps/function.go b/helper/maps/function.go
index 3d1c659..e8f6279 100644
--- a/helper/maps/function.go
+++ b/helper/maps/function.go
@@ -2,14 +2,18 @@ package maps
 
 import "strings"
 
-func GetStrAnyVal[T any](m map[string]any, key string) (r T, o bool) {
-	k := strings.Split(key, ".")
+func GetStrAnyVal[T any](m map[string]any, key string, delimiter ...string) (r T, o bool) {
+	separator := "."
+	if len(delimiter) > 0 && delimiter[0] != "" {
+		separator = delimiter[0]
+	}
+	k := strings.Split(key, separator)
 	if len(k) > 1 {
 		val, ok := m[k[0]]
 		if ok {
 			vx, ok := val.(map[string]any)
 			if ok {
-				r, o = GetStrAnyVal[T](vx, strings.Join(k[1:], "."))
+				r, o = GetStrAnyVal[T](vx, strings.Join(k[1:], separator))
 			}
 		}
 	} else {
@@ -107,31 +111,41 @@ func GetAnyAnyValWithDefaults[T any](m map[any]any, defaults T, key ...any) (r T
 	return
 }
 
-func RecursiveSetStrVal[T any](m map[string]any, k string, v T) {
-	kk := strings.Split(k, ".")
+func RecursiveSetStrVal[T any](m map[string]any, k string, v T, delimiter ...string) {
+	del := "."
+	if len(delimiter) > 0 && delimiter[0] != "" {
+		del = delimiter[0]
+	}
+	kk := strings.Split(k, del)
 	if len(kk) < 1 {
 		return
 	} else if len(kk) < 2 {
 		m[k] = v
 		return
 	}
-	for i, _ := range kk[0 : len(kk)-1] {
-		key := strings.Join(kk[0:i+1], ".")
-		mm, ok := GetStrAnyVal[map[string]any](m, key)
+	mm, ok := GetStrAnyVal[map[string]any](m, strings.Join(kk[0:len(kk)-1], del))
+	if ok {
+		mm[kk[len(kk)-1]] = v
+		return
+	}
+	mx, ok := GetStrAnyVal[map[string]any](m, kk[0])
+	if !ok {
+		m[kk[0]] = map[string]any{}
+		mx = m[kk[0]].(map[string]any)
+	}
+	for i, _ := range kk[0 : len(kk)-2] {
+		key := kk[i+1]
+		mm, ok := mx[key]
 		if !ok {
-			mm = map[string]any{}
-			preKey := strings.Join(kk[0:i], ".")
-			if preKey == "" {
-				RecursiveSetStrVal(m, key, mm)
-			} else {
-				m, _ := GetStrAnyVal[map[string]any](m, preKey)
-				RecursiveSetStrVal(m, kk[i], mm)
-			}
+			mmm := map[string]any{}
+			mx[key] = mmm
+			mx = mmm
+
+		} else {
+			mx = mm.(map[string]any)
 		}
 	}
-	key := strings.Join(kk[0:len(kk)-1], ".")
-	mm, _ := GetStrAnyVal[map[string]any](m, key)
-	mm[kk[len(kk)-1]] = v
+	mx[kk[len(kk)-1]] = v
 }
 
 func RecursiveSetAnyVal[T any](m map[any]any, v T, k ...any) {
diff --git a/helper/maps/function_test.go b/helper/maps/function_test.go
index 331a4d3..9807712 100644
--- a/helper/maps/function_test.go
+++ b/helper/maps/function_test.go
@@ -267,6 +267,22 @@ func TestRecursiveSetStrVal(t *testing.T) {
 				v: 1,
 			},
 		},
+		{
+			name: "t2",
+			args: args[int]{
+				m: map[string]any{"aa": map[string]any{}},
+				k: "aa.bb.cc",
+				v: 1,
+			},
+		},
+		{
+			name: "t3",
+			args: args[int]{
+				m: map[string]any{"aa": map[string]any{"bb": map[string]any{}}},
+				k: "aa.bb.cc",
+				v: 1,
+			},
+		},
 	}
 	target := map[string]any{"aa": map[string]any{"bb": map[string]any{"cc": 1}}}
 	for _, tt := range tests {