js: Interface() returns js.S / js.M / js.F (#137)

neelance · neelance · commit 8e4ec4484250 · 2015-01-03T17:37:59.000+01:00
diff --git a/compiler/prelude/jsmapping.go b/compiler/prelude/jsmapping.go
@@ -235,7 +235,7 @@ var $internalize = function(v, t, recv) {
     case Float64Array:
       return new ($sliceType($Float64))(v);
     case Array:
-      return $internalize(v, $sliceType($emptyInterface));
+      return $internalize(v, $packages["github.com/gopherjs/gopherjs/js"].S);
     case Boolean:
       return new $Bool(!!v);
     case Date:
@@ -244,7 +244,7 @@ var $internalize = function(v, t, recv) {
         return new timePkg.Time(timePkg.Unix(new $Int64(0, 0), new $Int64(0, v.getTime() * 1000000)));
       }
     case Function:
-      var funcType = $funcType([$sliceType($emptyInterface)], [$packages["github.com/gopherjs/gopherjs/js"].Object], true);
+      var funcType = $packages["github.com/gopherjs/gopherjs/js"].F;
       return new funcType($internalize(v, funcType));
     case Number:
       return new $Float64(parseFloat(v));
@@ -254,7 +254,7 @@ var $internalize = function(v, t, recv) {
       if ($global.Node && v instanceof $global.Node) {
         return v;
       }
-      var mapType = $mapType($String, $emptyInterface);
+      var mapType = $packages["github.com/gopherjs/gopherjs/js"].M;
       return new mapType($internalize(v, mapType));
     }
   case $kindMap:
diff --git a/js/js.go b/js/js.go
@@ -2,23 +2,23 @@
 //
 // Type conversions between Go types and JavaScript types are performed automatically according to the following table:
 //
-//  | Go types                       | Go interface type              | JavaScript type |
-//  | ------------------------------ | ------------------------------ | --------------- |
-//  | bool                           | bool                           | Boolean         |
-//  | int?, uint?, float?            | float64                        | Number          |
-//  | string                         | string                         | String          |
-//  | [?]int8                        | []int8                         | Int8Array       |
-//  | [?]int16                       | []int16                        | Int16Array      |
-//  | [?]int32, [?]int               | []int                          | Int32Array      |
-//  | [?]uint8                       | []uint8                        | Uint8Array      |
-//  | [?]uint16                      | []uint16                       | Uint16Array     |
-//  | [?]uint32, [?]uint, [?]uintptr | []uint                         | Uint32Array     |
-//  | [?]float32                     | []float32                      | Float32Array    |
-//  | [?]float64                     | []float64                      | Float64Array    |
-//  | all other slices and arrays    | []interface{}                  | Array           |
-//  | maps, structs                  | map[string]interface{}         | Object          |
-//  | functions                      | func(...interface{}) js.Object | Function        |
-//  | time.Time                      | time.Time                      | Date            |
+//  | Go types                       | Go interface type | JavaScript type |
+//  | ------------------------------ | ----------------- | --------------- |
+//  | bool                           | bool              | Boolean         |
+//  | int?, uint?, float?            | float64           | Number          |
+//  | string                         | string            | String          |
+//  | [?]int8                        | []int8            | Int8Array       |
+//  | [?]int16                       | []int16           | Int16Array      |
+//  | [?]int32, [?]int               | []int             | Int32Array      |
+//  | [?]uint8                       | []uint8           | Uint8Array      |
+//  | [?]uint16                      | []uint16          | Uint16Array     |
+//  | [?]uint32, [?]uint, [?]uintptr | []uint            | Uint32Array     |
+//  | [?]float32                     | []float32         | Float32Array    |
+//  | [?]float64                     | []float64         | Float64Array    |
+//  | all other slices and arrays    | js.S              | Array           |
+//  | maps, structs                  | js.M              | Object          |
+//  | functions                      | js.F              | Function        |
+//  | time.Time                      | time.Time         | Date            |
 //
 // The second column denotes the types that are used when converting to `interface{}`. An exception are DOM elements, those are kept with the js.Object type. Additionally, a pointer to a named type is passed to JavaScript as an object which has wrappers for the type's exported methods. This can be used to provide getter and setter methods for Go fields to JavaScript.
 package js
@@ -129,14 +129,20 @@ func Keys(o Object) []string {
 	return s
 }
 
+// S is a simple slice type. It is intended as a shorthand for JavaScript arrays (before conversion).
+type S []interface{}
+
 // M is a simple map type. It is intended as a shorthand for JavaScript objects (before conversion).
 type M map[string]interface{}
 
-// S is a simple slice type. It is intended as a shorthand for JavaScript arrays (before conversion).
-type S []interface{}
+// F is a simple func type.
+type F func(...interface{}) Object
 
 func init() {
-	// avoid dead code elimination of Error
+	// avoid dead code elimination
 	e := Error{}
-	_ = e
+	s := interface{}(S(nil))
+	m := interface{}(M(nil))
+	f := interface{}(F(nil))
+	_, _, _, _ = e, s, m, f
 }
diff --git a/js/js_test.go b/js/js_test.go
@@ -212,7 +212,7 @@ func TestFunc(t *testing.T) {
 		t.Fail()
 	}
 
-	add := dummys.Get("add").Interface().(func(...interface{}) js.Object)
+	add := dummys.Get("add").Interface().(js.F)
 	var i int64 = 40
 	if add(i, 2).Int() != 42 {
 		t.Fail()

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ func TestFunc(t *testing.T) {`
`212`	`212`	`t.Fail()`
`213`	`213`	`}`
`214`	`214`
`215`		`- add := dummys.Get("add").Interface().(func(...interface{}) js.Object)`
	`215`	`+ add := dummys.Get("add").Interface().(js.F)`
`216`	`216`	`var i int64 = 40`
`217`	`217`	`if add(i, 2).Int() != 42 {`
`218`	`218`	`t.Fail()`