chore: update gjson unmarshal

Change-Id: Ifdb9a7c06885fb6f2b665bdc3520e07c320b43ce

Author: andeya

binding/bind_test.go

@@ -13,13 +13,20 @@ import (
 	"testing"
 	"time"
 
+	// "github.com/bytedance/go-tagexpr/v2/binding/gjson"
+	vd "github.com/bytedance/go-tagexpr/v2/validator"
+	"github.com/davecgh/go-spew/spew"
 	"github.com/henrylee2cn/ameda"
 	"github.com/henrylee2cn/goutil/httpbody"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/bytedance/go-tagexpr/v2/binding"
 )
 
+func init() {
+	// gjson.UseJSONUnmarshaler()
+}
+
 func TestRawBody(t *testing.T) {
 	type Recv struct {
 		S []byte   `raw_body:""`
@@ -1107,7 +1114,7 @@ func TestIssue25(t *testing.T) {
 
 func TestIssue26(t *testing.T) {
 	type Recv struct {
-		Type            string `json:"type,required" vd:"($=='update_target_threshold' && (target_threshold)$!='-1') || ($=='update_status' && (status)$!='-1')"`
+		Type            string `json:"type,required" vd:"($=='update_target_threshold' && (TargetThreshold)$!='-1') || ($=='update_status' && (Status)$!='-1')"`
 		RuleName        string `json:"rule_name,required" vd:"regexp('^rule[0-9]+$')"`
 		TargetThreshold string `json:"target_threshold" vd:"regexp('^-?[0-9]+(\\.[0-9]+)?$')"`
 		Status          string `json:"status" vd:"$=='0' || $=='1'"`
@@ -1133,18 +1140,24 @@ func TestIssue26(t *testing.T) {
 
 	recv := new(Recv)
 	err := json.Unmarshal(b, recv)
+	assert.NoError(t, err)
+	err = vd.Validate(&recv, true)
+	assert.NoError(t, err)
+	t.Log(spew.Sdump(recv))
+
 	header := make(http.Header)
 	header.Set("Content-Type", "application/json")
 	header.Set("A", "from header")
 	cookies := []*http.Cookie{
 		{Name: "A", Value: "from cookie"},
 	}
-	// gjson.UseJSONUnmarshaler()
+
 	req := newRequest("/1", header, cookies, bytes.NewReader(b))
 	binder := binding.New(nil)
 	recv2 := new(Recv)
 	err = binder.BindAndValidate(&recv2, req, nil)
 	assert.NoError(t, err)
+	t.Log(spew.Sdump(recv2))
 	assert.Equal(t, recv, recv2)
 }
 

binding/gjson/gjson.go

@@ -24,6 +24,7 @@ package gjson
 import (
 	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"reflect"
 	"strings"
@@ -66,18 +67,12 @@ func assign(jsval gjson.Result, goval reflect.Value) (err error) {
 	switch goval.Kind() {
 	default:
 	case reflect.Ptr:
-		if !goval.IsNil() {
-			newval := reflect.New(goval.Elem().Type())
-			if err = assign(jsval, newval.Elem()); err != nil {
-				return err
-			}
-			goval.Elem().Set(newval.Elem())
-		} else {
-			newval := reflect.New(t.Elem())
-			if err = assign(jsval, newval.Elem()); err != nil {
-				return err
-			}
-			goval.Set(newval)
+		if !ameda.InitPointer(goval) {
+			return errors.New("v cannot be set")
+		}
+		newval := ameda.DereferencePtrValue(goval)
+		if err = assign(jsval, newval); err != nil {
+			return err
 		}
 	case reflect.Struct:
 		runtimeTypeID := ameda.ValueFrom(goval).RuntimeTypeID()

binding/gjson/gjson_test.go

@@ -60,10 +60,10 @@ func TestMap(t *testing.T) {
           }
         }`)
 
-	x3 := X{}
+	var x3 *X
 	err = unmarshal(data, &x3)
 	assert.NoError(t, err)
-	assert.Equal(t, x, x3)
+	assert.Equal(t, x, *x3)
 }
 
 func TestStruct(t *testing.T) {

go.mod

@@ -3,11 +3,11 @@ module github.com/bytedance/go-tagexpr/v2
 go 1.14
 
 require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.1
 	github.com/henrylee2cn/ameda v1.4.10
 	github.com/henrylee2cn/goutil v0.0.0-20210127050712-89660552f6f8
 	github.com/nyaruka/phonenumbers v1.0.55
 	github.com/stretchr/testify v1.5.1
-	github.com/tidwall/gjson v1.6.0
+	github.com/tidwall/gjson v1.9.3
 	google.golang.org/protobuf v1.27.1
 )