fix: Use json.Valid (#500)

erezrokah · web-flow · commit 4242e5ec3ad6 · 2022-12-14T16:59:23.000Z
So we support more types like arrays, strings, etc.

---
diff --git a/schema/json.go b/schema/json.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"reflect"
 )
 
@@ -55,10 +56,8 @@ func (dst *JSON) Set(src interface{}) error {
 			*dst = JSON{Bytes: []byte(""), Status: Null}
 			return nil
 		}
-		// validate this is a valid json string
-		err := json.Unmarshal([]byte(value), &struct{}{})
-		if err != nil {
-			return err
+		if !json.Valid([]byte(value)) {
+			return fmt.Errorf("invalid json: %s", value)
 		}
 		*dst = JSON{Bytes: []byte(value), Status: Present}
 	case *string:
@@ -69,10 +68,8 @@ func (dst *JSON) Set(src interface{}) error {
 				*dst = JSON{Bytes: []byte(""), Status: Null}
 				return nil
 			}
-			// validate this is a valid json
-			err := json.Unmarshal([]byte(*value), &struct{}{})
-			if err != nil {
-				return err
+			if !json.Valid([]byte(*value)) {
+				return fmt.Errorf("invalid json: %s", *value)
 			}
 			*dst = JSON{Bytes: []byte(*value), Status: Present}
 		}
@@ -85,10 +82,8 @@ func (dst *JSON) Set(src interface{}) error {
 				return nil
 			}
 
-			// validate this is a valid json
-			err := json.Unmarshal(value, &struct{}{})
-			if err != nil {
-				return err
+			if !json.Valid(value) {
+				return fmt.Errorf("invalid json: %s", value)
 			}
 			*dst = JSON{Bytes: value, Status: Present}
 		}
diff --git a/schema/json_test.go b/schema/json_test.go
@@ -15,7 +15,13 @@ func TestJSONSet(t *testing.T) {
 	}{
 		{source: "", result: JSON{Bytes: []byte(""), Status: Null}},
 		{source: "{}", result: JSON{Bytes: []byte("{}"), Status: Present}},
+		{source: `"test"`, result: JSON{Bytes: []byte(`"test"`), Status: Present}},
+		{source: "1", result: JSON{Bytes: []byte("1"), Status: Present}},
+		{source: "[1, 2, 3]", result: JSON{Bytes: []byte("[1, 2, 3]"), Status: Present}},
 		{source: []byte("{}"), result: JSON{Bytes: []byte("{}"), Status: Present}},
+		{source: []byte(`"test"`), result: JSON{Bytes: []byte(`"test"`), Status: Present}},
+		{source: []byte("1"), result: JSON{Bytes: []byte("1"), Status: Present}},
+		{source: []byte("[1, 2, 3]"), result: JSON{Bytes: []byte("[1, 2, 3]"), Status: Present}},
 		{source: ([]byte)(nil), result: JSON{Status: Null}},
 		{source: (*string)(nil), result: JSON{Status: Null}},
 

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"encoding/json"`
`6`	`6`	`"errors"`
	`7`	`+ "fmt"`
`7`	`8`	`"reflect"`
`8`	`9`	`)`
`9`	`10`
`@@ -55,10 +56,8 @@ func (dst *JSON) Set(src interface{}) error {`
`55`	`56`	`*dst = JSON{Bytes: []byte(""), Status: Null}`
`56`	`57`	`return nil`
`57`	`58`	`}`
`58`		`- // validate this is a valid json string`
`59`		`- err := json.Unmarshal([]byte(value), &struct{}{})`
`60`		`- if err != nil {`
`61`		`- return err`
	`59`	`+ if !json.Valid([]byte(value)) {`
	`60`	`+ return fmt.Errorf("invalid json: %s", value)`
`62`	`61`	`}`
`63`	`62`	`*dst = JSON{Bytes: []byte(value), Status: Present}`
`64`	`63`	`case *string:`
`@@ -69,10 +68,8 @@ func (dst *JSON) Set(src interface{}) error {`
`69`	`68`	`*dst = JSON{Bytes: []byte(""), Status: Null}`
`70`	`69`	`return nil`
`71`	`70`	`}`
`72`		`- // validate this is a valid json`
`73`		`- err := json.Unmarshal([]byte(*value), &struct{}{})`
`74`		`- if err != nil {`
`75`		`- return err`
	`71`	`+ if !json.Valid([]byte(*value)) {`
	`72`	`+ return fmt.Errorf("invalid json: %s", *value)`
`76`	`73`	`}`
`77`	`74`	`dst = JSON{Bytes: []byte(value), Status: Present}`
`78`	`75`	`}`
`@@ -85,10 +82,8 @@ func (dst *JSON) Set(src interface{}) error {`
`85`	`82`	`return nil`
`86`	`83`	`}`
`87`	`84`
`88`		`- // validate this is a valid json`
`89`		`- err := json.Unmarshal(value, &struct{}{})`
`90`		`- if err != nil {`
`91`		`- return err`
	`85`	`+ if !json.Valid(value) {`
	`86`	`+ return fmt.Errorf("invalid json: %s", value)`
`92`	`87`	`}`
`93`	`88`	`*dst = JSON{Bytes: value, Status: Present}`
`94`	`89`	`}`