Use MarshalJSON() of the wrapped Go value if available

dop251 · Jun 30, 2017 · 8f3380f · 8f3380f
1 parent a6ed999
commit 8f3380f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/builtin_json.go b/builtin_json.go
@@ -311,6 +311,13 @@ func (ctx *_builtinJSON_stringifyContext) str(key Value, holder *Object) bool {
 		case *objectGoReflect:
 			if o1.toJson != nil {
 				value = ctx.r.ToValue(o1.toJson())
+			} else if v, ok := o1.origValue.Interface().(json.Marshaler); ok {
+				b, err := v.MarshalJSON()
+				if err != nil {
+					panic(err)
+				}
+				ctx.buf.Write(b)
+				return true
 			} else {
 				switch o1.className() {
 				case classNumber:

diff --git a/builtin_json_test.go b/builtin_json_test.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"strings"
 	"testing"
+	"time"
 )
 
 func TestJSONMarshalObject(t *testing.T) {
@@ -20,6 +21,19 @@ func TestJSONMarshalObject(t *testing.T) {
 	}
 }
 
+func TestJSONMarshalGoDate(t *testing.T) {
+	vm := New()
+	o := vm.NewObject()
+	o.Set("test", time.Unix(86400, 0).UTC())
+	b, err := json.Marshal(o)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if string(b) != `{"test":"1970-01-02T00:00:00Z"}` {
+		t.Fatalf("Unexpected value: %s", b)
+	}
+}
+
 func TestJSONMarshalObjectCircular(t *testing.T) {
 	vm := New()
 	o := vm.NewObject()