Merge pull request #8 from h3110w0r1d-y/main

修复传入数组指针时引发PANIC的BUG, 修复递归时传值导致指针丢失的BUG, 修正部分测试用例

Author: liu-cn

filter/example_test.go

@@ -22,42 +22,44 @@ func ExampleSelect() {
 	user := User{ID: 1, Name: &name, Age: 21, Tags: []Tag{{"icon", "foo"}, {"icon", "bar"}}}
 	article := Select("article", &user) //尽量传指针
 	null := Select("null", &user)
-	user.Name = nil
+	//user.Name = nil
 	profile := Select("profile", &user)
 	articleJSON, _ := json.Marshal(article)
 	fmt.Println(string(articleJSON))
 	fmt.Println(profile) //可以直接打印，打印会直接输出过滤后的json
 	fmt.Println(null)
 
 	//Output:
-	//{"id":1,"name":"小北","tags":[{"icon":"icon"},{"icon":"icon"}]}
+	//{"age":21,"id":1,"name":"小北","tags":[{"icon":"icon"},{"icon":"icon"}]}
 	//{"age":21,"id":1,"name":"小北","tags":[{"name":"foo"},{"name":"bar"}]}
 	//{"id":1}
 }
 
 func (a *Article) GetHot() {
 
 }
-func ExampleOmit() {
-	type (
-		Tag struct {
-			Icon string `json:"icon,omit(article)"`
-			Name string `json:"name,omit(profile)"`
-		}
-		Articles struct {
-			Password int   `json:"password,omit($any)"` //$any表示任何场景都排除该字段
-			Tags     []Tag `json:"tags"`
-			Hot      int   `json:"hot,select(img),func(GetHot)"` //热度 过滤时会调用GetHot方法获取该字段的值
-			Like     int   `json:"-"`
-			Collect  int   `json:"-"`
-		}
-	)
 
-	//func (a Articles) GetHot() int { //这个方法里可以对字段进行处理，处理后可以返回一个任意值
-	//	return a.Like + a.Collect
-	//}
+type (
+	ExampleOmitTag struct {
+		Icon string `json:"icon,omit(article)"`
+		Name string `json:"name,omit(profile)"`
+	}
+	ExampleOmitArticles struct {
+		Password int              `json:"password,omit($any)"` //$any表示任何场景都排除该字段
+		Tags     []ExampleOmitTag `json:"tags"`
+		Hot      int              `json:"hot,select(img),func(GetHot)"` //热度 过滤时会调用GetHot方法获取该字段的值
+		Like     int              `json:"-"`
+		Collect  int              `json:"-"`
+	}
+)
+
+func (a ExampleOmitArticles) GetHot() int { //这个方法里可以对字段进行处理，处理后可以返回一个任意值
+	return a.Like + a.Collect
+}
+
+func ExampleOmit() {
 
-	articles := Articles{Like: 100, Collect: 20, Tags: []Tag{{"icon", "foo"}, {"icon", "bar"}}}
+	articles := ExampleOmitArticles{Like: 100, Collect: 20, Tags: []ExampleOmitTag{{"icon", "foo"}, {"icon", "bar"}}}
 	article := Omit("article", &articles) //尽量传指针，不传指针func选择器中的用指针接收的方法无法被调用
 	profile := Omit("profile", &articles)
 	articleJSON, _ := json.Marshal(article)

filter/filter.go

@@ -1,6 +1,9 @@
 package filter
 
-import "fmt"
+import (
+	"fmt"
+	"reflect"
+)
 
 type Filter struct {
 	node *fieldNodeTree
@@ -16,7 +19,7 @@ func jsonFilter(selectScene string, el interface{}, isSelect bool) Filter {
 		Key:        "",
 		ParentNode: nil,
 	}
-	tree.parseAny("", selectScene, el, isSelect)
+	tree.parseAny("", selectScene, reflect.ValueOf(el), isSelect)
 	return Filter{
 		node: tree,
 	}

filter/parser.go

@@ -10,12 +10,12 @@ type tagInfo struct {
 	omit bool //表示这个字段忽略
 }
 
-func (t *fieldNodeTree) parseAny(key, scene string, el interface{}, isSelect bool) {
-	typeOf := reflect.TypeOf(el)
-	valueOf := reflect.ValueOf(el)
+func (t *fieldNodeTree) parseAny(key, scene string, valueOf reflect.Value, isSelect bool) {
+	typeOf := valueOf.Type()
 TakePointerValue: //取指针的值
 	switch typeOf.Kind() {
-	case reflect.Ptr: //如果是指针类型则取地址重新判断类型
+	case reflect.Ptr: //如果是指针类型则取值重新判断类型
+		valueOf = valueOf.Elem()
 		typeOf = typeOf.Elem()
 		goto TakePointerValue
 	case reflect.Struct:
@@ -110,12 +110,6 @@ func getSelectTag(scene string, pkgInfo string, i int, typeOf reflect.Type) tagI
 }
 
 func parserMap(valueOf reflect.Value, t *fieldNodeTree, scene string, isSelect bool) {
-
-takeVMap:
-	if valueOf.Kind() == reflect.Ptr {
-		valueOf = valueOf.Elem()
-		goto takeVMap
-	}
 	keys := valueOf.MapKeys()
 	if len(keys) == 0 { //空map情况下解析为{}
 		t.Val = struct{}{}
@@ -143,7 +137,7 @@ takeVMap:
 			nodeTree.IsNil = true
 			t.AddChild(nodeTree)
 		} else {
-			nodeTree.parseAny(k, scene, val.Interface(), isSelect)
+			nodeTree.parseAny(k, scene, val, isSelect)
 			t.AddChild(nodeTree)
 		}
 	}
@@ -165,18 +159,6 @@ func parserBaseType(valueOf reflect.Value, t *fieldNodeTree, key string) {
 }
 
 func parserStruct(typeOf reflect.Type, valueOf reflect.Value, t *fieldNodeTree, scene string, key string, isSelect bool) {
-
-TakeValueOfPointerValue: //这里主要是考虑到有可能用的不是一级指针，如果是***int 等多级指针就需要不断的取值
-	if valueOf.Kind() == reflect.Ptr {
-		if valueOf.IsNil() {
-			t.IsNil = true
-			return
-		} else {
-			valueOf = valueOf.Elem()
-			goto TakeValueOfPointerValue
-		}
-	}
-
 	if valueOf.CanConvert(timeTypes) { //是time.Time类型或者底层是time.Time类型
 		t.Key = key
 		t.Val = valueOf.Interface()
@@ -248,7 +230,7 @@ TakeValueOfPointerValue: //这里主要是考虑到有可能用的不是一级
 			}
 		}
 
-		tree.parseAny(tag.UseFieldName, scene, value.Interface(), isSelect)
+		tree.parseAny(tag.UseFieldName, scene, value, isSelect)
 
 		if t.IsAnonymous {
 			t.AnonymousAddChild(tree)
@@ -263,7 +245,6 @@ TakeValueOfPointerValue: //这里主要是考虑到有可能用的不是一级
 }
 
 func parserSliceOrArray(typeOf reflect.Type, valueOf reflect.Value, t *fieldNodeTree, scene string, key string, isSelect bool) {
-
 	val1 := valueOf.Interface()
 	ok := valueOf.CanConvert(byteTypes)
 	if ok {
@@ -310,7 +291,7 @@ func parserSliceOrArray(typeOf reflect.Type, valueOf reflect.Value, t *fieldNode
 			node.IsNil = true
 			t.AddChild(node)
 		} else {
-			node.parseAny("", scene, val.Interface(), isSelect)
+			node.parseAny("", scene, val, isSelect)
 			t.AddChild(node)
 		}
 	}

go.mod

@@ -2,6 +2,4 @@ module github.com/liu-cn/json-filter
 
 go 1.17
 
-require (
-	github.com/liu-cn/pkg v0.0.0-20221218135636-865c46b102ea
-)
+require github.com/liu-cn/pkg v0.0.0-20221218135636-865c46b102ea

test/main.go

@@ -64,7 +64,6 @@ func newUs() Us {
 }
 
 func main() {
-
 	//var bb = []byte(`{"a":"1"}`)
 	u := Us{
 		BB:         [3]byte{1, 2, 4},
@@ -75,7 +74,9 @@ func main() {
 		Avatar:     []byte("uuid"),
 		Avatar2:    []byte("uuid2"),
 	}
-
+	list := []Us{u, u, u}
+	fmt.Println(filter.Omit("1", &list))
+	//return
 	fmt.Println(mustJson(u))
 	//fmt.Println(filter.Omit("h", u))
 	//fmt.Println(filter.Select("all", u))