Fix js.ValueOf() with map[string]interface{} and []interface{} under gopherjs

ncw · ncw · commit 081e6aca538a · 2018-10-11T15:51:16.000+01:00
This means that gopherjs ValueOf supports the same types as supported by the wasm version. Add a test for js.ValueOf also. Fixes #19
diff --git a/js/js_notwasm.go b/js/js_notwasm.go
@@ -181,7 +181,7 @@ func ValueOf(x interface{}) Value {
 		return x.Value
 	case nil:
 		return Null()
-	case bool, int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64, float32, float64, unsafe.Pointer, string:
+	case bool, int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64, float32, float64, unsafe.Pointer, string, map[string]interface{}, []interface{}:
 		return Value{v: id.Invoke(x)}
 	default:
 		panic(`invalid arg: ` + reflect.TypeOf(x).String())
diff --git a/js/js_test.go b/js/js_test.go
@@ -5,6 +5,7 @@
 package js_test
 
 import (
+	"fmt"
 	"math"
 	"testing"
 
@@ -167,3 +168,57 @@ func TestType(t *testing.T) {
 		t.Errorf("got %s, want %s", got, want)
 	}
 }
+
+func TestValueOf(t *testing.T) {
+	for _, test := range []struct {
+		in         interface{}
+		wantType   js.Type
+		wantString string
+	}{
+		{js.Value(js.ValueOf(42)), js.TypeNumber, "42"},
+		{js.NewCallback(func(args []js.Value) {}), js.TypeFunction, ""},
+		{js.TypedArrayOf([]int8{1, 2, 3}), js.TypeObject, "1,2,3"},
+		{nil, js.TypeNull, "null"},
+		{bool(true), js.TypeBoolean, "true"},
+		{int(1), js.TypeNumber, "1"},
+		{int8(2), js.TypeNumber, "2"},
+		{int16(3), js.TypeNumber, "3"},
+		{int32(4), js.TypeNumber, "4"},
+		{int64(5), js.TypeNumber, "5"},
+		{uint(6), js.TypeNumber, "6"},
+		{uint8(7), js.TypeNumber, "7"},
+		{uint16(8), js.TypeNumber, "8"},
+		{uint32(9), js.TypeNumber, "9"},
+		{uint64(10), js.TypeNumber, "10"},
+		{float32(11), js.TypeNumber, "11"},
+		{float64(12), js.TypeNumber, "12"},
+		// FIXME this doesn't work {unsafe.Pointer(&x19), js.TypeNumber, ""},
+		{string("hello"), js.TypeString, "hello"},
+		{map[string]interface{}{"a": 1, "b": "c"}, js.TypeObject, "[object Object]"},
+		{[]interface{}{1, 2, 3}, js.TypeObject, "1,2,3"},
+	} {
+		t.Run(fmt.Sprintf("%T", test.in), func(t *testing.T) {
+			got := js.ValueOf(test.in)
+			if got.Type() != test.wantType {
+				t.Errorf("type: got %v want %v", got.Type(), test.wantType)
+			}
+			if test.wantString != "" && got.String() != test.wantString {
+				t.Errorf("string: got %v want %v", got.String(), test.wantString)
+			}
+		})
+	}
+
+	// Check unknown types panic
+	didPanic := false
+	func() {
+		defer func() {
+			if r := recover(); r != nil {
+				didPanic = true
+			}
+		}()
+		_ = js.ValueOf([]struct{}{})
+	}()
+	if !didPanic {
+		t.Errorf("Unknown type didn't panic")
+	}
+}
