Support logging as json all kind of goja's objects (#2511)

* Support logging as json all kind of goja's objects

* More tests for console.Log supported types

Author: codebien

js/console.go

@@ -23,7 +23,6 @@ package js
 import (
 	"encoding/json"
 	"os"
-	"reflect"
 	"strings"
 
 	"github.com/dop251/goja"
@@ -97,17 +96,12 @@ func (c console) Error(args ...goja.Value) {
 }
 
 func (c console) valueString(v goja.Value) string {
-	exptype := v.ExportType()
-	if exptype == nil {
+	mv, ok := v.(json.Marshaler)
+	if !ok {
 		return v.String()
 	}
 
-	kind := exptype.Kind()
-	if kind != reflect.Map && kind != reflect.Slice {
-		return v.String()
-	}
-
-	b, err := json.Marshal(v)
+	b, err := json.Marshal(mv)
 	if err != nil {
 		return v.String()
 	}

js/console_test.go

@@ -1,23 +1,3 @@
-/*
- *
- * k6 - a next-generation load testing tool
- * Copyright (C) 2016 Load Impact
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
 package js
 
 import (
@@ -107,6 +87,87 @@ func extractLogger(fl logrus.FieldLogger) *logrus.Logger {
 	return nil
 }
 
+func TestConsoleLogWithGojaNativeObject(t *testing.T) {
+	t.Parallel()
+
+	rt := goja.New()
+	rt.SetFieldNameMapper(common.FieldNameMapper{})
+
+	obj := rt.NewObject()
+	err := obj.Set("text", "nativeObject")
+	require.NoError(t, err)
+
+	logger := testutils.NewLogger(t)
+	hook := logtest.NewLocal(logger)
+
+	c := newConsole(logger)
+	c.Log(obj)
+
+	entry := hook.LastEntry()
+	require.NotNil(t, entry, "nothing logged")
+	assert.JSONEq(t, `{"text":"nativeObject"}`, entry.Message)
+}
+
+func TestConsoleLogObjectsWithGoTypes(t *testing.T) {
+	t.Parallel()
+
+	type value struct {
+		Text string
+	}
+
+	tests := []struct {
+		name string
+		in   interface{}
+		exp  string
+	}{
+		{
+			name: "StructLiteral",
+			in: value{
+				Text: "test1",
+			},
+			exp: `{"text":"test1"}`,
+		},
+		{
+			name: "StructPointer",
+			in: &value{
+				Text: "test2",
+			},
+			exp: `{"text":"test2"}`,
+		},
+		{
+			name: "Map",
+			in: map[string]interface{}{
+				"text": "test3",
+			},
+			exp: `{"text":"test3"}`,
+		},
+	}
+
+	expFields := logrus.Fields{"source": "console"}
+	for _, tt := range tests {
+		tt := tt
+
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
+			rt := goja.New()
+			rt.SetFieldNameMapper(common.FieldNameMapper{})
+			obj := rt.ToValue(tt.in)
+
+			logger := testutils.NewLogger(t)
+			hook := logtest.NewLocal(logger)
+
+			c := newConsole(logger)
+			c.Log(obj)
+
+			entry := hook.LastEntry()
+			require.NotNil(t, entry, "nothing logged")
+			assert.JSONEq(t, tt.exp, entry.Message)
+			assert.Equal(t, expFields, entry.Data)
+		})
+	}
+}
+
 func TestConsoleLog(t *testing.T) {
 	t.Parallel()