👔 up(text,struct): update some util method, fix text replace error

gookit · Mar 26, 2023 · a3f173c · a3f173c
1 parent 721b54a
commit a3f173c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/structs/convert.go b/structs/convert.go
@@ -61,7 +61,7 @@ func StructToMap(st any, optFns ...MapOptFunc) (map[string]any, error) {
 	}
 
 	if obj.Kind() != reflect.Struct {
-		return mp, errors.New("must be an struct")
+		return mp, errors.New("must be an struct value")
 	}
 
 	opt := &MapOptions{TagName: defaultFieldTag}

diff --git a/strutil/textutil/var_replacer.go b/strutil/textutil/var_replacer.go
@@ -87,7 +87,7 @@ func (r *VarReplacer) Init() *VarReplacer {
 	if !r.init {
 		r.lLen, r.rLen = len(r.Left), len(r.Right)
 		if r.Right != "" {
-			r.varReg = regexp.MustCompile(regexp.QuoteMeta(r.Left) + `([\w\s.-|]+)` + regexp.QuoteMeta(r.Right))
+			r.varReg = regexp.MustCompile(regexp.QuoteMeta(r.Left) + `([\w\s\|.-]+)` + regexp.QuoteMeta(r.Right))
 		} else {
 			// no right tag. eg: $name, $user.age
 			r.varReg = regexp.MustCompile(regexp.QuoteMeta(r.Left) + `(\w[\w-]*(?:\.[\w-]+)*)`)