compiler: fix incorrect emitted Javascript for type switch

myitcv · myitcv · commit 5fc26c036a81 · 2017-09-06T06:45:58.000+01:00
This brings the code emitted for a type switch with a *js.Object case in line with the runtime $assertType function. In the case of a *js.Object value, we have to dereference via .$val.object. Fixes #682
diff --git a/compiler/statements.go b/compiler/statements.go
@@ -123,7 +123,9 @@ func (c *funcContext) translateStmt(stmt ast.Stmt, label *types.Label) {
 			var bodyPrefix []ast.Stmt
 			if implicit := c.p.Implicits[clause]; implicit != nil {
 				value := refVar
-				if _, isInterface := implicit.Type().Underlying().(*types.Interface); !isInterface {
+				if typesutil.IsJsObject(implicit.Type().Underlying()) {
+					value += ".$val.object"
+				} else if _, ok := implicit.Type().Underlying().(*types.Interface); !ok {
 					value += ".$val"
 				}
 				bodyPrefix = []ast.Stmt{&ast.AssignStmt{
diff --git a/js/js_test.go b/js/js_test.go
@@ -571,3 +571,28 @@ func TestUint8Array(t *testing.T) {
 		t.Errorf("Non-empty byte array is not externalized as a Uint8Array")
 	}
 }
+
+func TestTypeSwitchJsObject(t *testing.T) {
+	obj := js.Global.Get("Object").New()
+	obj.Set("foo", "bar")
+
+	exp := "bar"
+
+	if act := obj.Get("foo").String(); act != exp {
+		t.Fatalf("Direct access to *js.Object field gave %q; expected %q", act, exp)
+	}
+
+	var x interface{} = obj
+	switch x := x.(type) {
+	case *js.Object:
+		if act := x.Get("foo").String(); act != exp {
+			t.Fatalf("Value passed through interface and type switch gave %q; expected %q", act, exp)
+		}
+	}
+
+	if y, ok := x.(*js.Object); ok {
+		if act := y.Get("foo").String(); act != exp {
+			t.Fatalf("Value passed through interface and type assert gave %q; expected %q", act, exp)
+		}
+	}
+}
